July 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r9739 - trunk/libavcodec/alac.c
by subversion＠mplayerhq.hu 07 Aug '07

07 Aug '07

Author: vitor Date: Wed Jul 18 16:45:01 2007 New Revision: 9739 Log: Make more deinterlace_16 receive an array as a parameter and not two separated vars Modified: trunk/libavcodec/alac.c Modified: trunk/libavcodec/alac.c ============================================================================== --- trunk/libavcodec/alac.c (original) +++ trunk/libavcodec/alac.c Wed Jul 18 16:45:01 2007 @@ -399,7 +399,7 @@ static void predictor_decompress_fir_ada } } -static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b, +static void deinterlace_16(int32_t *buffer[MAX_CHANNELS], int16_t *buffer_out, int numchannels, int numsamples, uint8_t interlacing_shift, @@ -416,8 +416,8 @@ static void deinterlace_16(int32_t *buff int16_t left; int16_t right; - midright = buffer_a[i]; - difference = buffer_b[i]; + midright = buffer[0][i]; + difference = buffer[1][i]; right = midright - ((difference * interlacing_leftweight) >> interlacing_shift); @@ -434,8 +434,8 @@ static void deinterlace_16(int32_t *buff for (i = 0; i < numsamples; i++) { int16_t left, right; - left = buffer_a[i]; - right = buffer_b[i]; + left = buffer[0][i]; + right = buffer[1][i]; buffer_out[i*numchannels] = left; buffer_out[i*numchannels + 1] = right; @@ -602,8 +602,7 @@ static int alac_decode_frame(AVCodecCont switch(alac->setinfo_sample_size) { case 16: { if (channels == 2) { - deinterlace_16(alac->outputsamples_buffer[0], - alac->outputsamples_buffer[1], + deinterlace_16(alac->outputsamples_buffer, (int16_t*)outbuffer, alac->numchannels, outputsamples,

4 6

r9326 - in trunk: doc/hooks.texi vhook/imlib2.c
by subversion＠mplayerhq.hu 07 Aug '07

07 Aug '07

Author: ramiro Date: Fri Jun 15 22:40:14 2007 New Revision: 9326 Log: Allow user to specify rgb.txt for imlib2 vhook Modified: trunk/doc/hooks.texi trunk/vhook/imlib2.c Modified: trunk/doc/hooks.texi ============================================================================== --- trunk/doc/hooks.texi (original) +++ trunk/doc/hooks.texi Fri Jun 15 22:40:14 2007 @@ -67,8 +67,13 @@ with the full path to the font file, as @end example where 20 is the point size. +You can specify the filename to read RGB color names from. If none are +specified, these defaults are used: @file{/usr/share/X11/rgb.txt} and + at file{/usr/lib/X11/rgb.txt} + Options: @multitable @columnfractions .2 .8 + at item @option{-C <rgb.txt>} @tab The filename to read RGB color names from @item @option{-c <color>} @tab The color of the text @item @option{-F <fontname>} @tab The font face and size @item @option{-t <text>} @tab The text @@ -137,6 +142,14 @@ Usage examples: a newline are treated as end-of-file. To create blank lines, use lines that consist of space characters only. + # Scrolling credits with custom color from a text file + ffmpeg -i input.avi -vhook \ + 'vhook/imlib2.so -C rgb.txt -c CustomColor1 -F VeraBd.ttf/16 -x 100 -y -1.0*N -f credits.txt' \ + -sameq output.avi + + This example does the same as the one above, but specifies an rgb.txt file + to be used, which has a custom made color in it. + # scrolling credits from a graphics file ffmpeg -sameq -i input.avi \ -vhook 'vhook/imlib2.so -x 0 -y -1.0*N -i credits.png' output.avi Modified: trunk/vhook/imlib2.c ============================================================================== --- trunk/vhook/imlib2.c (original) +++ trunk/vhook/imlib2.c Fri Jun 15 22:40:14 2007 @@ -15,6 +15,10 @@ * * Options: * + * -C <rgb.txt> The filename to read RGB color names from + * Defaults if none specified: + * /usr/share/X11/rgb.txt + * /usr/lib/X11/rgb.txt * -c <color> The color of the text * -F <fontname> The font face and size * -t <text> The text @@ -176,6 +180,7 @@ int Configure(void **ctxp, int argc, cha { int c; ContextInfo *ci; + char *rgbtxt = 0; char *font = "LucidaSansDemiBold/16"; char *fp = getenv("FONTPATH"); char *color = 0; @@ -203,8 +208,11 @@ int Configure(void **ctxp, int argc, cha imlib_add_path_to_font_path(fp); - while ((c = getopt(argc, argv, "c:f:F:t:x:y:i:")) > 0) { + while ((c = getopt(argc, argv, "C:c:f:F:t:x:y:i:")) > 0) { switch (c) { + case 'C': + rgbtxt = optarg; + break; case 'c': color = optarg; break; @@ -246,11 +254,16 @@ int Configure(void **ctxp, int argc, cha char buff[256]; int done = 0; + if (rgbtxt) + f = fopen(rgbtxt, "r"); + else + { f = fopen("/usr/share/X11/rgb.txt", "r"); if (!f) f = fopen("/usr/lib/X11/rgb.txt", "r"); + } if (!f) { - fprintf(stderr, "Failed to find rgb.txt\n"); + fprintf(stderr, "Failed to find RGB color names file\n"); return -1; } while (fgets(buff, sizeof(buff), f)) {

4 5

r9044 - trunk/libavformat/http.c
by subversion＠mplayerhq.hu 03 Aug '07

03 Aug '07

Author: alex Date: Thu May 17 12:30:03 2007 New Revision: 9044 Log: use usleep instead sleep Modified: trunk/libavformat/http.c Modified: trunk/libavformat/http.c ============================================================================== --- trunk/libavformat/http.c (original) +++ trunk/libavformat/http.c Thu May 17 12:30:03 2007 @@ -245,7 +245,7 @@ static int http_connect(URLContext *h, c s->off = 0; s->filesize = -1; if (post) { - sleep(1); + usleep(1000*1000); return 0; }

4 4

r9845 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: michael Date: Tue Jul 31 23:39:09 2007 New Revision: 9845 Log: move some code which was executed for every skiped MB so its only executed for the first skiped mb in a run Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Tue Jul 31 23:39:09 2007 @@ -221,26 +221,7 @@ static int mpeg_decode_mb(MpegEncContext assert(s->mb_skipped==0); if (s->mb_skip_run-- != 0) { - if(s->pict_type == I_TYPE){ - av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); - return -1; - } - - /* skip mb */ - s->mb_intra = 0; - for(i=0;i<12;i++) - s->block_last_index[i] = -1; - if(s->picture_structure == PICT_FRAME) - s->mv_type = MV_TYPE_16X16; - else - s->mv_type = MV_TYPE_FIELD; if (s->pict_type == P_TYPE) { - /* if P type, zero motion vector is implied */ - s->mv_dir = MV_DIR_FORWARD; - s->mv[0][0][0] = s->mv[0][0][1] = 0; - s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; - s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; - s->field_select[0][0]= s->picture_structure - 1; s->mb_skipped = 1; s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; } else { @@ -253,12 +234,6 @@ static int mpeg_decode_mb(MpegEncContext if(IS_INTRA(mb_type)) return -1; - /* if B type, reuse previous vectors and directions */ - s->mv[0][0][0] = s->last_mv[0][0][0]; - s->mv[0][0][1] = s->last_mv[0][0][1]; - s->mv[1][0][0] = s->last_mv[1][0][0]; - s->mv[1][0][1] = s->last_mv[1][0][1]; - s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= mb_type | MB_TYPE_SKIP; // assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8)); @@ -1828,6 +1803,36 @@ static int mpeg_decode_slice(Mpeg1Contex break; } } + if(s->mb_skip_run){ + int i; + if(s->pict_type == I_TYPE){ + av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); + return -1; + } + + /* skip mb */ + s->mb_intra = 0; + for(i=0;i<12;i++) + s->block_last_index[i] = -1; + if(s->picture_structure == PICT_FRAME) + s->mv_type = MV_TYPE_16X16; + else + s->mv_type = MV_TYPE_FIELD; + if (s->pict_type == P_TYPE) { + /* if P type, zero motion vector is implied */ + s->mv_dir = MV_DIR_FORWARD; + s->mv[0][0][0] = s->mv[0][0][1] = 0; + s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; + s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; + s->field_select[0][0]= s->picture_structure - 1; + } else { + /* if B type, reuse previous vectors and directions */ + s->mv[0][0][0] = s->last_mv[0][0][0]; + s->mv[0][0][1] = s->last_mv[0][0][1]; + s->mv[1][0][0] = s->last_mv[1][0][0]; + s->mv[1][0][1] = s->last_mv[1][0][1]; + } + } } } eos: // end of slice

1 0

r9844 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: michael Date: Tue Jul 31 23:00:17 2007 New Revision: 9844 Log: get rid of a useless variable Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Tue Jul 31 23:00:17 2007 @@ -1663,7 +1663,6 @@ static int mpeg_decode_slice(Mpeg1Contex { MpegEncContext *s = &s1->mpeg_enc_ctx; AVCodecContext *avctx= s->avctx; - int ret; const int field_pic= s->picture_structure != PICT_FRAME; const int lowres= s->avctx->lowres; @@ -1738,10 +1737,7 @@ static int mpeg_decode_slice(Mpeg1Contex XVMC_init_block(s);//set s->block #endif - ret = mpeg_decode_mb(s, s->block); - - dprintf(s->avctx, "ret=%d\n", ret); - if (ret < 0) + if(mpeg_decode_mb(s, s->block) < 0) return -1; if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs

1 0

r9843 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: michael Date: Tue Jul 31 22:52:49 2007 New Revision: 9843 Log: avoid 2 additions (1 cpu cycle) per MB Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Tue Jul 31 22:52:49 2007 @@ -1776,8 +1776,8 @@ static int mpeg_decode_slice(Mpeg1Contex } s->dest[0] += 16 >> lowres; - s->dest[1] += 16 >> (s->chroma_x_shift + lowres); - s->dest[2] += 16 >> (s->chroma_x_shift + lowres); + s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift; + s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift; MPV_decode_mb(s, s->block);

1 0

r9842 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: michael Date: Tue Jul 31 22:44:48 2007 New Revision: 9842 Log: chroma_qscale seems not used anywhere for mpeg1/2 so dont waste cpu time setting it Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Tue Jul 31 22:44:48 2007 @@ -1739,7 +1739,6 @@ static int mpeg_decode_slice(Mpeg1Contex #endif ret = mpeg_decode_mb(s, s->block); - s->chroma_qscale= s->qscale; dprintf(s->avctx, "ret=%d\n", ret); if (ret < 0)

1 0

r9841 - trunk/libavcodec/mpegvideo_common.h
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: takis Date: Tue Jul 31 18:22:57 2007 New Revision: 9841 Log: Fix typo Modified: trunk/libavcodec/mpegvideo_common.h Modified: trunk/libavcodec/mpegvideo_common.h ============================================================================== --- trunk/libavcodec/mpegvideo_common.h (original) +++ trunk/libavcodec/mpegvideo_common.h Tue Jul 31 18:22:57 2007 @@ -522,7 +522,7 @@ static inline void qpel_motion(MpegEncCo } /** - * h263 chorma 4mv motion compensation. + * h263 chroma 4mv motion compensation. */ static inline void chroma_4mv_motion(MpegEncContext *s, uint8_t *dest_cb, uint8_t *dest_cr,

1 0

r9840 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 31 Jul '07

31 Jul '07

Author: benoit Date: Tue Jul 31 17:20:36 2007 New Revision: 9840 Log: fill title, author, copyright and comment fields by parsing udta atom Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Tue Jul 31 17:20:36 2007 @@ -1036,6 +1036,46 @@ static int mov_read_trak(MOVContext *c, return mov_read_default(c, pb, atom); } +static void mov_parse_udta_string(ByteIOContext *pb, char *str, int size) +{ + uint16_t str_size = get_be16(pb); /* string length */; + + get_be16(pb); /* skip language */ + get_buffer(pb, str, FFMIN(size, str_size)); +} + +static int mov_read_udta(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) +{ + uint64_t end = url_ftell(pb) + atom.size; + + while (url_ftell(pb) + 8 < end) { + uint32_t tag_size = get_be32(pb); + uint32_t tag = get_le32(pb); + uint64_t next = url_ftell(pb) + tag_size - 8; + + switch (tag) { + case MKTAG(0xa9,'n','a','m'): + mov_parse_udta_string(pb, c->fc->title, sizeof(c->fc->title)); + break; + case MKTAG(0xa9,'w','r','t'): + mov_parse_udta_string(pb, c->fc->author, sizeof(c->fc->author)); + break; + case MKTAG(0xa9,'c','p','y'): + mov_parse_udta_string(pb, c->fc->copyright, sizeof(c->fc->copyright)); + break; + case MKTAG(0xa9,'i','n','f'): + mov_parse_udta_string(pb, c->fc->comment, sizeof(c->fc->comment)); + break; + default: + break; + } + + url_fseek(pb, next, SEEK_SET); + } + + return 0; +} + static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; @@ -1200,6 +1240,7 @@ static const MOVParseTableEntry mov_defa { MKTAG( 's', 't', 't', 's' ), mov_read_stts }, { MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */ { MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak }, +{ MKTAG( 'u', 'd', 't', 'a' ), mov_read_udta }, { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave }, { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds }, { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */

1 0