diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-08-04 09:16:40 +0000 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-08-04 09:16:40 +0000 |
| commit | 19bee306fe54e89b5aa3b4937d5eec441d783ab0 (patch) | |
| tree | 9b41a605bea3133f797329f811b8680071e1a7e4 /gst/avi/gstavimux.c | |
| parent | 815eb01af17e509b5deaf187140b7faed8baa889 (diff) | |
gst/avi/gstavimux.c: Provide cbSize field for audio extra_data size, and take care to pad extra_data.
Original commit message from CVS:
* gst/avi/gstavimux.c: (gst_avi_mux_riff_get_avi_header):
Provide cbSize field for audio extra_data size, and take care to
pad extra_data.
Diffstat (limited to 'gst/avi/gstavimux.c')
| -rw-r--r-- | gst/avi/gstavimux.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 80d8ba8d..ac5b8348 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -990,8 +990,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) + (g_slist_length (avimux->sinkpads) * (100 + sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_vids) + sizeof (gst_riff_vprp) - + sizeof (gst_riff_strf_auds) - + ODML_SUPERINDEX_SIZE)); + + sizeof (gst_riff_strf_auds) + 2 + ODML_SUPERINDEX_SIZE)); buffer = gst_buffer_new_and_alloc (size); buffdata = GST_BUFFER_DATA (buffer); highmark = 0; @@ -1042,7 +1041,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) if (vidpad->vids_codec_data) codec_size = GST_BUFFER_SIZE (vidpad->vids_codec_data); strl_size = sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_vids) - + codec_size + 4 * 5 + ODML_SUPERINDEX_SIZE; + + GST_ROUND_UP_2 (codec_size) + 4 * 5 + ODML_SUPERINDEX_SIZE; if (vidpad->vprp.aspect) { /* let's be on the safe side */ vidpad->vprp.fields = MIN (vidpad->vprp.fields, @@ -1054,8 +1053,8 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) } else { if (audpad->auds_codec_data) codec_size = GST_BUFFER_SIZE (audpad->auds_codec_data); - strl_size = sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_auds) - + codec_size + 4 * 5 + ODML_SUPERINDEX_SIZE; + strl_size = sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_auds) + 2 + + GST_ROUND_UP_2 (codec_size) + 4 * 5 + ODML_SUPERINDEX_SIZE; } /* stream list metadata */ @@ -1113,6 +1112,11 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) buffdata += codec_size; highmark += codec_size; } + /* padding */ + if (highmark & 0x1) { + highmark++; + buffdata++; + } /* add video property data, mainly for aspect ratio, if any */ if (vprp_size) { @@ -1153,7 +1157,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) /* the audio header */ memcpy (buffdata + 0, "strf", 4); GST_WRITE_UINT32_LE (buffdata + 4, - sizeof (gst_riff_strf_auds) + codec_size); + sizeof (gst_riff_strf_auds) + 2 + codec_size); /* the actual header */ GST_WRITE_UINT16_LE (buffdata + 8, audpad->auds.format); GST_WRITE_UINT16_LE (buffdata + 10, audpad->auds.channels); @@ -1161,8 +1165,9 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) GST_WRITE_UINT32_LE (buffdata + 16, audpad->auds.av_bps); GST_WRITE_UINT16_LE (buffdata + 20, audpad->auds.blockalign); GST_WRITE_UINT16_LE (buffdata + 22, audpad->auds.size); - buffdata += 24; - highmark += 24; + GST_WRITE_UINT16_LE (buffdata + 24, codec_size); + buffdata += 26; + highmark += 26; /* include codec data, if any */ if (codec_size) { @@ -1172,6 +1177,11 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) buffdata += codec_size; highmark += codec_size; } + /* padding */ + if (highmark & 0x1) { + highmark++; + buffdata++; + } } /* odml superindex chunk */ |