opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 12:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

change the logic to mux 13818-3 and 11172-3 in mp4, less code

Browse Source 
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-09-03 19:42:09 +00:00
parent e00c3de821
commit c4e02d702c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/isom.c
View File

@ -40,10 +40,10 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */ { CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */
{ CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */ { CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */
{ CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */ { CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */
{ CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
{ CODEC_ID_MP2 , 0x69 }, /* 11172-3 */
{ CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */ { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
{ CODEC_ID_MP3 , 0x6B }, /* 11172-3 */ { CODEC_ID_MP3 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP2 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
{ CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */
{ CODEC_ID_PNG , 0x6D }, { CODEC_ID_PNG , 0x6D },
{ CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */

5
libavformat/movenc.c
View File

@ -319,9 +319,8 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack *track) // Basic
// Object type indication // Object type indication
if ((track->enc->codec_id == CODEC_ID_MP2 || if ((track->enc->codec_id == CODEC_ID_MP2 ||
track->enc->codec_id == CODEC_ID_MP3) && track->enc->codec_id == CODEC_ID_MP3) &&
track->enc->sample_rate <= 24000 && track->enc->sample_rate > 24000)
track->enc->sample_rate >= 16000) put_byte(pb, 0x6B); // 11172-3
put_byte(pb, 105); // 13818-3
else else
put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)); put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id));