July 2006 - ffmpeg-cvslog - lists.ffmpeg.org

r5860 - trunk/configure
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: diego Date: Sun Jul 30 00:44:58 2006 New Revision: 5860 Modified: trunk/configure Log: Set custom SLIBNAME_WITH_MAJOR and SLIBNAME_WITH_VERSION for MinGW. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sun Jul 30 00:44:58 2006 @@ -879,6 +879,8 @@ SLIBPREF="" SLIBSUF=".dll" EXESUF=".exe" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi if test "$force_libdir" != yes; then bindir="$PREFIX"; fi fi

1 0

r5859 - trunk/version.sh
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: diego Date: Sat Jul 29 23:43:24 2006 New Revision: 5859 Modified: trunk/version.sh Log: Cope with localized Subversion clients. Modified: trunk/version.sh ============================================================================== --- trunk/version.sh (original) +++ trunk/version.sh Sat Jul 29 23:43:24 2006 @@ -1,6 +1,6 @@ #!/bin/sh -svn_revision=`cd "$1" && svn info 2> /dev/null | grep Revision | cut -d' ' -f2` +svn_revision=`cd "$1" && LANG=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` test $svn_revision || svn_revision=UNKNOWN NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""

1 0

r5857 - in trunk/libavformat: asf.c asf.h
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: gpoirier Date: Sat Jul 29 18:07:19 2006 New Revision: 5857 Modified: trunk/libavformat/asf.c trunk/libavformat/asf.h Log: The reader ignores the size of the ASF data object and keeps on reading even beyond it. Therefore if the ASF file includes an index object at its end, the reader will treat the index like data, but of course will fail since it thinks that the data is corrupted. When reading an asf file with an index object, ffmpeg will complain at the end of the file that it read an invalid header. Patch by Kohn Emil Dan, < emild A cs P technion P ac P il > Original thead: Date: Apr 18, 2006 4:11 PM Subject: [Ffmpeg-devel] Two ASF related bugs and fixes Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c (original) +++ trunk/libavformat/asf.c Sat Jul 29 18:07:19 2006 @@ -327,6 +327,12 @@ pos2 = url_ftell(pb); url_fskip(pb, gsize - (pos2 - pos1 + 24)); } else if (!memcmp(&g, &data_header, sizeof(GUID))) { + asf->data_object_offset = url_ftell(pb); + if (gsize != (uint64_t)-1 && gsize >= 24) { + asf->data_object_size = gsize - 24; + } else { + asf->data_object_size = (uint64_t)-1; + } break; } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { int len1, len2, len3, len4, len5; @@ -552,6 +558,9 @@ /* fail safe */ url_fskip(pb, ret); asf->packet_pos= url_ftell(&s->pb); + if (asf->data_object_size != (uint64_t)-1 && + (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) + return AVERROR_IO; /* Do not exceed the size of the data object */ ret = asf_get_packet(s); //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); if (ret < 0 || url_feof(pb)) Modified: trunk/libavformat/asf.h ============================================================================== --- trunk/libavformat/asf.h (original) +++ trunk/libavformat/asf.h Sat Jul 29 18:07:19 2006 @@ -32,7 +32,7 @@ int ds_data_size; int ds_silence_data; - int packet_pos; + int64_t packet_pos; } ASFStream; @@ -98,6 +98,8 @@ ByteIOContext pb; /* only for reading */ uint64_t data_offset; /* begining of the first data packet */ + uint64_t data_object_offset; /* data object offset (excl. GUID & size)*/ + uint64_t data_object_size; /* size of the data object */ ASFMainHeader hdr; @@ -117,7 +119,7 @@ int packet_obj_size; int packet_time_delta; int packet_time_start; - int packet_pos; + int64_t packet_pos; int stream_index;

1 0

r5856 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 17:36:13 2006 New Revision: 5856 Modified: trunk/libavformat/mxf.c Log: add information about codec uls Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 17:36:13 2006 @@ -686,11 +686,11 @@ static const MXFCodecUL mxf_codec_uls[] = { /* PictureEssenceCoding */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO }, /* I-Frame */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P at ML I-Frame */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P at HL Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO }, /* MP at ML Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* 422P at ML Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* MP at HL Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO }, /* D-10 30Mbps PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO50 PAL */

1 0

r5855 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 17:31:27 2006 New Revision: 5855 Modified: trunk/libavformat/mxf.c Log: another MPEG-2 long gop codec ul Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 17:31:27 2006 @@ -690,6 +690,7 @@ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO }, /* D-10 30Mbps PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO50 PAL */

1 0

r5854 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 17:25:08 2006 New Revision: 5854 Modified: trunk/libavformat/mxf.c Log: another MPEG-2 long gop codec ul Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 17:25:08 2006 @@ -688,6 +688,7 @@ /* PictureEssenceCoding */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO }, /* I-Frame */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO }, /* Long GoP */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO }, /* D-10 30Mbps PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */

1 0

r5853 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 17:19:31 2006 New Revision: 5853 Modified: trunk/libavformat/mxf.c Log: add uncompressed picture support Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 17:19:31 2006 @@ -583,6 +583,29 @@ return -1; } +static void mxf_read_metadata_pixel_layout(ByteIOContext *pb, MXFDescriptor *descriptor) +{ + int code; + + do { + code = get_byte(pb); + dprintf("pixel layout: code 0x%x\n", code); + switch (code) { + case 0x52: /* R */ + descriptor->bits_per_sample += get_byte(pb); + break; + case 0x47: /* G */ + descriptor->bits_per_sample += get_byte(pb); + break; + case 0x42: /* B */ + descriptor->bits_per_sample += get_byte(pb); + break; + default: + get_byte(pb); + } + } while (code != 0); /* SMPTE 377M E.2.46 */ +} + static int mxf_read_metadata_generic_descriptor(MXFContext *mxf, KLVPacket *klv) { ByteIOContext *pb = &mxf->fc->pb; @@ -631,6 +654,9 @@ case 0x3D01: descriptor->bits_per_sample = get_be32(pb); break; + case 0x3401: + mxf_read_metadata_pixel_layout(pb, descriptor); + break; default: url_fskip(pb, size); } @@ -669,6 +695,7 @@ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO25 PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_JPEG2K }, /* JPEG2000 Codestream */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_RAWVIDEO }, /* Uncompressed */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_PCM_S16LE }, { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */ @@ -786,6 +813,7 @@ if (st->codec->codec_type == CODEC_TYPE_VIDEO) { st->codec->width = descriptor->width; st->codec->height = descriptor->height; + st->codec->bits_per_sample = descriptor->bits_per_sample; /* Uncompressed */ } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { st->codec->channels = descriptor->channels; st->codec->bits_per_sample = descriptor->bits_per_sample;

1 0

r5852 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 16:00:47 2006 New Revision: 5852 Modified: trunk/libavformat/mxf.c Log: parse rgba descriptor (jpeg2000, uncompressed) Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 16:00:47 2006 @@ -152,6 +152,7 @@ static const UID mxf_metadata_multiple_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x44,0x00 }; static const UID mxf_metadata_generic_sound_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x42,0x00 }; static const UID mxf_metadata_cdci_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x28,0x00 }; +static const UID mxf_metadata_rgba_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x29,0x00 }; static const UID mxf_metadata_mpegvideo_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 }; static const UID mxf_metadata_wave_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 }; static const UID mxf_metadata_static_track_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3A,0x00 }; @@ -841,6 +842,8 @@ ret = mxf_read_metadata_generic_descriptor(mxf, &klv); else if (IS_KLV_KEY(klv.key, mxf_metadata_cdci_descriptor_key)) ret = mxf_read_metadata_generic_descriptor(mxf, &klv); + else if (IS_KLV_KEY(klv.key, mxf_metadata_rgba_descriptor_key)) + ret = mxf_read_metadata_generic_descriptor(mxf, &klv); else if (IS_KLV_KEY(klv.key, mxf_metadata_generic_sound_descriptor_key)) ret = mxf_read_metadata_generic_descriptor(mxf, &klv); else if (IS_KLV_KEY(klv.key, mxf_metadata_preface_key))

1 0

r5851 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 15:40:04 2006 New Revision: 5851 Modified: trunk/libavformat/mxf.c Log: add common codecs uls Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 15:40:04 2006 @@ -667,9 +667,14 @@ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO50 PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DVCPRO25 PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ + //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_JPEG2K }, /* JPEG2000 Codestream */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_PCM_S16LE }, { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_PCM_ALAW }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 }, CODEC_ID_AC3 }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 }, CODEC_ID_MP2 }, /* MP2 or MP3 */ + //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, CODEC_ID_DOLBY_E }, /* Dolby-E */ }; static enum CodecID mxf_get_codec_id(const MXFCodecUL *uls, UID *uid)

1 0

r5850 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 29 Jul '06

29 Jul '06

Author: bcoudurier Date: Sat Jul 29 15:23:56 2006 New Revision: 5850 Modified: trunk/libavformat/mxf.c Log: simplify PRINT_KEY Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jul 29 15:23:56 2006 @@ -163,14 +163,8 @@ #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y))) -#define PRINT_KEY(x) \ -do { \ - int iterpk; \ - for (iterpk = 0; iterpk < 16; iterpk++) { \ - av_log(NULL, AV_LOG_DEBUG, "%02X ", x[iterpk]); \ - } \ - av_log(NULL, AV_LOG_DEBUG, "\n"); \ -} while (0); \ +#define PRINT_KEY(x) dprintf("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", \ + x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15]) static int64_t klv_decode_ber_length(ByteIOContext *pb) {

1 0