July 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2954 - mxf/mxfenc.c
by spyfeng 31 Jul '08

31 Jul '08

Author: spyfeng Date: Thu Jul 31 17:59:32 2008 New Revision: 2954 Log: combine mxf_picture_essence_container_uls and mxf_sound_essence_container_uls into mxf_essence_container_uls Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Thu Jul 31 17:59:32 2008 @@ -149,13 +149,11 @@ static const MXFCodecUL mxf_codec_uls[] static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 }; -static const MXFCodecUL mxf_picture_essence_container_uls[] = { +static const MXFCodecUL mxf_essence_container_uls[] = { + // picture essence container { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ // { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, -}; - -static const MXFCodecUL mxf_sound_essence_container_uls[] = { + // audio essence conatiner uls { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 }, 14, CODEC_ID_PCM_S16LE }, /* BWF Frame wrapped */ // { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 }, 14, CODEC_ID_MP2 }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */ // { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, CODEC_ID_PCM_S16LE }, /* D-10 Mapping 50Mbps PAL Extended Template */ @@ -813,7 +811,7 @@ static int mxf_write_mpeg_video_desc(AVF av_log(s, AV_LOG_DEBUG, "linked track ID:%d\n", stream_index); #endif - codec_ul = mxf_get_essence_container_ul(mxf_picture_essence_container_uls, st->codec->codec_id); + codec_ul = mxf_get_essence_container_ul(mxf_essence_container_uls, st->codec->codec_id); mxf_write_local_tag(pb, 16, 0x3004); put_buffer(pb, codec_ul->uid, 16); @@ -854,7 +852,7 @@ static int mxf_write_wav_desc(AVFormatCo #ifdef DEBUG PRINT_KEY(s, "wav desc uid", (*refs->track)[stream_index]); #endif - codec_ul = mxf_get_essence_container_ul(mxf_sound_essence_container_uls, st->codec->codec_id); + codec_ul = mxf_get_essence_container_ul(mxf_essence_container_uls, st->codec->codec_id); mxf_write_local_tag(pb, 16, 0x3004); put_buffer(pb, codec_ul->uid, 16); @@ -964,15 +962,7 @@ static int mxf_build_essence_container_r for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; - switch (st->codec->codec_type) { - case CODEC_TYPE_VIDEO: - codec_ul = mxf_get_essence_container_ul(mxf_picture_essence_container_uls, st->codec->codec_id); - break; - case CODEC_TYPE_AUDIO: - codec_ul = mxf_get_essence_container_ul(mxf_sound_essence_container_uls, st->codec->codec_id); - break; - } - + codec_ul = mxf_get_essence_container_ul(mxf_essence_container_uls, st->codec->codec_id); if (codec_ul) { if (mxf_add_essence_container_ul(mxf, codec_ul) < 0 ) return -1;

1 0

[soc]: r2932 - mxf/mxfenc.c
by spyfeng 31 Jul '08

31 Jul '08

Author: spyfeng Date: Wed Jul 30 18:06:11 2008 New Revision: 2932 Log: remove av_random(). use simple way to generate random number as uid. Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 18:06:11 2008 @@ -87,7 +87,7 @@ typedef struct MXFContext { int64_t header_start; int64_t header_byte_count_offset; int64_t header_footer_partition_offset; - AVRandomState random_state; + unsigned int random_state; MXFReferenceContext *reference; char *track_number_sign; UID *track_essence_element_key; @@ -226,12 +226,11 @@ static const MXFLocalTagPair mxf_local_t static void mxf_generate_uuid(AVFormatContext *s, UID uuid) { MXFContext *mxf = s->priv_data; - int rand_num, i; + int i; for (i = 0; i < 16; i++) { - rand_num = av_random(&mxf->random_state); - rand_num &= 0x00ff; - uuid[i] = rand_num; + mxf->random_state= mxf->random_state*1664525+10139042; + uuid[i]= mxf->random_state>>24; } // the 7th byte is version according to ISO 11578 uuid[6] &= 0x0f; @@ -1038,7 +1037,6 @@ static int mux_write_header(AVFormatCont ByteIOContext *pb = s->pb; int64_t header_metadata_start; - av_init_random(0xbeefdead, &mxf->random_state); // intial MXFReferenceContext mxf->reference = av_mallocz(sizeof(MXFReferenceContext)); if (!mxf->reference)

3 2

[soc]: r2922 - mxf/mxfenc.c
by spyfeng 31 Jul '08

31 Jul '08

Author: spyfeng Date: Wed Jul 30 16:51:09 2008 New Revision: 2922 Log: check the condition when using LIBAVFORMAT_IDENT Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 16:51:09 2008 @@ -438,8 +438,12 @@ static int mxf_write_identification(AVFo company_name_len = strlen("FFmpeg") + 1; product_name_len = strlen("OP1a Muxer") + 1; - version_string_len = strlen(LIBAVFORMAT_IDENT) + 1; - length = 84 + company_name_len + product_name_len + version_string_len; + if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + version_string_len = strlen(LIBAVFORMAT_IDENT) + 1; + length = 84 + company_name_len + product_name_len + version_string_len; + } else { + length = 80 + company_name_len + product_name_len; + } klv_encode_ber_length(pb, length); @@ -461,8 +465,10 @@ static int mxf_write_identification(AVFo mxf_write_local_tag(pb, product_name_len, 0x3C02); put_buffer(pb, "OP1a Muxer", product_name_len); - mxf_write_local_tag(pb, version_string_len, 0x3C04); - put_buffer(pb, "LIBAVFORMAT_IDENT", version_string_len); + if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + mxf_write_local_tag(pb, version_string_len, 0x3C04); + put_buffer(pb, LIBAVFORMAT_IDENT, version_string_len); + } // write product uid mxf_generate_uuid(s, uid);

3 2

[soc]: r2953 - mxf/mxfenc.c
by spyfeng 31 Jul '08

31 Jul '08

Author: spyfeng Date: Thu Jul 31 15:12:45 2008 New Revision: 2953 Log: simplify caculate length of mxf_write_identification() Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Thu Jul 31 15:12:45 2008 @@ -436,13 +436,12 @@ static int mxf_write_identification(AVFo company_name_len = sizeof("FFmpeg"); product_name_len = sizeof("OP1a Muxer"); + + length = 80 + company_name_len + product_name_len; if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { version_string_len = sizeof(LIBAVFORMAT_IDENT); - length = 84 + company_name_len + product_name_len + version_string_len; - } else { - length = 80 + company_name_len + product_name_len; + length += 4 + version_string_len; } - klv_encode_ber_length(pb, length); // write uid

1 0

[soc]: r2952 - in jpeg2000: j2kdec.c j2kenc.c
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 14:56:45 2008 New Revision: 2952 Log: Include paths for files in other libav* dirs than the current one must now be prefixed with the appropriate subdir Modified: jpeg2000/j2kdec.c jpeg2000/j2kenc.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c (original) +++ jpeg2000/j2kdec.c Thu Jul 31 14:56:45 2008 @@ -29,7 +29,7 @@ #include "avcodec.h" #include "bytestream.h" #include "j2k.h" -#include "common.h" +#include "libavutil/common.h" #define HAD_COC 0x01 #define HAD_QCC 0x02 Modified: jpeg2000/j2kenc.c ============================================================================== --- jpeg2000/j2kenc.c (original) +++ jpeg2000/j2kenc.c Thu Jul 31 14:56:45 2008 @@ -29,7 +29,7 @@ #include "avcodec.h" #include "bytestream.h" #include "j2k.h" -#include "common.h" +#include "libavutil/common.h" #define NMSEDEC_BITS 7 #define NMSEDEC_FRACBITS (NMSEDEC_BITS-1)

1 0

[soc]: r2951 - jpeg2000/checkout.sh
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 14:52:46 2008 New Revision: 2951 Log: Update checkout script to work with merged patch Modified: jpeg2000/checkout.sh Modified: jpeg2000/checkout.sh ============================================================================== --- jpeg2000/checkout.sh (original) +++ jpeg2000/checkout.sh Thu Jul 31 14:52:46 2008 @@ -1,12 +1,10 @@ +#!/bin/sh echo "checking out ffmpeg svn" -svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg +svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg echo "patching ffmpeg" -cd ffmpeg ; -patch -p0 < ../doc.patch -cd libavformat ; -patch -p0 <../../avformat.patch -cd ../libavcodec ; -patch -p0 <../../ffmpeg.patch +cd ffmpeg +patch -p0 < ../ffmpeg.patch +cd libavcodec echo "copying the jpeg2000 files to ffmpeg/libavcodec" ln -s ../../j2kenc.c j2kenc.c ln -s ../../j2kdec.c j2kdec.c

1 0

[soc]: r2950 - in jpeg2000: avformat.patch doc.patch
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 14:50:38 2008 New Revision: 2950 Log: Remove unused patches Removed: jpeg2000/avformat.patch jpeg2000/doc.patch

1 0

[soc]: r2949 - jpeg2000/ffmpeg.patch
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 14:50:19 2008 New Revision: 2949 Log: Merge patches and make them apply to current svn Modified: jpeg2000/ffmpeg.patch Modified: jpeg2000/ffmpeg.patch ============================================================================== --- jpeg2000/ffmpeg.patch (original) +++ jpeg2000/ffmpeg.patch Thu Jul 31 14:50:19 2008 @@ -1,45 +1,61 @@ -Index: Makefile +Index: Changelog =================================================================== ---- Makefile (wersja 9451) -+++ Makefile (kopia robocza) -@@ -93,6 +93,8 @@ - OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o +--- Changelog (revision 14483) ++++ Changelog (working copy) +@@ -127,6 +127,7 @@ + - Motion Pixels Video decoder + - Motion Pixels MVI demuxer + - removed animated GIF decoder/demuxer ++- JPEG2000 encoder and decoder + + version 0.4.9-pre1: + +Index: libavcodec/Makefile +=================================================================== +--- libavcodec/Makefile (revision 14483) ++++ libavcodec/Makefile (working copy) +@@ -99,6 +99,8 @@ OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o - OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o -+OBJS-$(CONFIG_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o dwt.o -+OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o dwt.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o mjpegdec.o mjpeg.o golomb.o OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o golomb.o ++OBJS-$(CONFIG_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o dwt.o ++OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o dwt.o OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o -Index: allcodecs.c + OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o + OBJS-$(CONFIG_LOCO_DECODER) += loco.o golomb.o +Index: libavcodec/allcodecs.c =================================================================== ---- allcodecs.c (wersja 9451) -+++ allcodecs.c (kopia robocza) -@@ -92,6 +92,7 @@ - REGISTER_DECODER(INDEO3, indeo3); - REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video); - REGISTER_ENCDEC (JPEGLS, jpegls); -+ REGISTER_ENCDEC (JPEG2000, jpeg2000); - REGISTER_DECODER(KMVC, kmvc); - REGISTER_ENCODER(LIBX264, libx264); - REGISTER_ENCODER(LIBXVID, libxvid); -Index: allcodecs.h +--- libavcodec/allcodecs.c (revision 14483) ++++ libavcodec/allcodecs.c (working copy) +@@ -101,6 +101,7 @@ + REGISTER_DECODER (INDEO2, indeo2); + REGISTER_DECODER (INDEO3, indeo3); + REGISTER_DECODER (INTERPLAY_VIDEO, interplay_video); ++ REGISTER_ENCDEC (JPEG2000, jpeg2000); + REGISTER_ENCDEC (JPEGLS, jpegls); + REGISTER_DECODER (KMVC, kmvc); + REGISTER_ENCODER (LJPEG, ljpeg); +Index: doc/general.texi =================================================================== ---- allcodecs.h (wersja 9451) -+++ allcodecs.h (kopia robocza) -@@ -40,6 +40,7 @@ - extern AVCodec h264_encoder; - extern AVCodec huffyuv_encoder; - extern AVCodec jpegls_encoder; -+extern AVCodec jpeg2000_encoder; - extern AVCodec ljpeg_encoder; - extern AVCodec mdec_encoder; - extern AVCodec mjpeg_encoder; -@@ -117,6 +118,7 @@ - extern AVCodec indeo3_decoder; - extern AVCodec interplay_dpcm_decoder; - extern AVCodec interplay_video_decoder; -+extern AVCodec jpeg2000_decoder; - extern AVCodec jpegls_decoder; - extern AVCodec kmvc_decoder; - extern AVCodec loco_decoder; +--- doc/general.texi (revision 14483) ++++ doc/general.texi (working copy) +@@ -253,6 +253,7 @@ + @tab Used in Interplay .MVE files. + @item JPEG-LS @tab X @tab X + @tab fourcc: MJLS, lossless and near-lossless is supported. ++@item JPEG2000 @tab X @tab X + @item KMVC @tab @tab X + @tab Codec used in Worms games. + @item LOCO @tab @tab X +Index: libavformat/riff.c +=================================================================== +--- libavformat/riff.c (revision 14483) ++++ libavformat/riff.c (working copy) +@@ -156,6 +156,7 @@ + { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, + { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, + { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, ++ { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, + { CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, + { CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') }, + { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },

1 0

[soc]: r2948 - aac/aac.c
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 13:25:29 2008 New Revision: 2948 Log: 10l - missing av_log() parameter Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Jul 31 13:25:29 2008 @@ -1198,7 +1198,7 @@ static int decode_tns(AACContext * ac, G for (i = 0; i < tns->order[w][filt]; i++) tns->coef[w][filt][i] = get_bits(gb, coef_len); } else { - av_log(ac->avccontext, "TNS filter order %d is greater than maximum %d.", + av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.", tns->order[w][filt], tns_max_order); tns->order[w][filt] = 0; return -1;

1 0

[soc]: r2930 - aac/aac.c
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Wed Jul 30 17:37:41 2008 New Revision: 2930 Log: Add missing error check Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 17:37:41 2008 @@ -2314,7 +2314,8 @@ static int aac_decode_frame(AVCodecConte if((err = spectral_to_sample(ac))) return err; - output_samples(avccontext, data, data_size); + if((err = output_samples(avccontext, data, data_size))) + return err; return buf_size; }

3 3