mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux (and variants): handle pixel-aspect-ratio. Fixes #584358.

Browse source
This commit is contained in:
Mark Nauwelaerts 2009-06-01 23:00:44 +02:00
parent 98292e9efd
commit b0c0651d7c
4 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gst/qtmux/atoms.c
View file

@ -2804,14 +2804,56 @@ atom_trak_set_audio_type (AtomTRAK * trak, AtomsContext * context,
atom_trak_set_constant_size_samples (trak, sample_size);
}
AtomInfo *
build_pasp_extension (AtomTRAK * trak, gint par_width, gint par_height)
{
AtomData *atom_data;
GstBuffer *buf;
guint8 *data;
buf = gst_buffer_new_and_alloc (8);
data = GST_BUFFER_DATA (buf);
/* ihdr = image header box */
GST_WRITE_UINT32_BE (data, par_width);
GST_WRITE_UINT32_BE (data + 4, par_height);
atom_data = atom_data_new_from_gst_buffer (FOURCC_pasp, buf);
gst_buffer_unref (buf);
return build_atom_info_wrapper ((Atom *) atom_data, atom_data_copy_data,
atom_data_free);
}
void
atom_trak_set_video_type (AtomTRAK * trak, AtomsContext * context,
VisualSampleEntry * entry, guint32 scale, AtomInfo * ext)
{
SampleTableEntryMP4V *ste;
gint dwidth, dheight;
gint par_n = 0, par_d = 0;
atom_trak_set_video_commons (trak, context, scale, entry->width,
entry->height);
if ((entry->par_n != 1 || entry->par_d != 1) &&
(entry->par_n != entry->par_d)) {
par_n = entry->par_n;
par_d = entry->par_d;
}
dwidth = entry->width;
dheight = entry->height;
/* ISO file spec says track header w/h indicates track's visual presentation
* (so this together with pixels w/h implicitly defines PAR) */
if (par_n && (context->flavor == ATOMS_TREE_FLAVOR_ISOM)) {
if (par_n > par_d) {
dwidth = entry->width * par_n / par_d;
dheight = entry->height;
} else {
dwidth = entry->width * par_n / par_d;
dheight = entry->height;
}
}
atom_trak_set_video_commons (trak, context, scale, dwidth, dheight);
ste = atom_trak_add_video_entry (trak, context, entry->fourcc);
trak->is_video = TRUE;
@ -2825,6 +2867,12 @@ atom_trak_set_video_type (AtomTRAK * trak, AtomsContext * context,
if (ext)
ste->extension_atoms = g_list_prepend (ste->extension_atoms, ext);
/* QT spec has a pasp extension atom in stsd that can hold PAR */
if (par_n && (context->flavor == ATOMS_TREE_FLAVOR_MOV)) {
ste->extension_atoms = g_list_append (ste->extension_atoms,
build_pasp_extension (trak, par_n, par_d));
}
}
/* some sample description construction helpers */

2
gst/qtmux/atoms.h
View file

@ -602,6 +602,8 @@ typedef struct
guint depth;
guint frame_count;
gint color_table_id;
guint par_n;
guint par_d;
GstBuffer *codec_data;
} VisualSampleEntry;

1
gst/qtmux/fourcc.h
View file

@ -104,6 +104,7 @@ G_BEGIN_DECLS
#define FOURCC_wave GST_MAKE_FOURCC('w','a','v','e')
#define FOURCC_appl GST_MAKE_FOURCC('a','p','p','l')
#define FOURCC_esds GST_MAKE_FOURCC('e','s','d','s')
#define FOURCC_pasp GST_MAKE_FOURCC('p','a','s','p')
#define FOURCC_hnti GST_MAKE_FOURCC('h','n','t','i')
#define FOURCC_rtp_ GST_MAKE_FOURCC('r','t','p',' ')
#define FOURCC_sdp_ GST_MAKE_FOURCC('s','d','p',' ')

3
gst/qtmux/gstqtmux.c
View file

@ -1464,7 +1464,6 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
par_den = 1;
gst_structure_get_fraction (structure, "pixel-aspect-ratio", &par_num,
&par_den);
/* FIXME: pixel-aspect-ratio */
qtpad->is_out_of_order = FALSE;
@ -1477,6 +1476,8 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
/* set common properties */
entry.width = width;
entry.height = height;
entry.par_n = par_num;
entry.par_d = par_den;
/* should be OK according to qt and iso spec, override if really needed */
entry.color_table_id = -1;
entry.frame_count = 1;