September 2008 - ffmpeg-cvslog

r15431 - trunk/Changelog
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: michael Date: Fri Sep 26 21:57:06 2008 New Revision: 15431 Log: Forgotten changelog update for ASS/SSA (de)muxer. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Fri Sep 26 21:57:06 2008 @@ -136,6 +136,7 @@ version <next> - MXF muxer - E-AC-3 support added to AC-3 decoder - Nellymoser ASAO encoder +- ASS and SSA demuxer and muxer version 0.4.9-pre1:

1 0

r15429 - trunk/configure
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: diego Date: Fri Sep 26 21:35:17 2008 New Revision: 15429 Log: whitespace cosmetics Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Sep 26 21:35:17 2008 @@ -1381,7 +1381,7 @@ disabled static && LIBNAME="" if enabled_any libfaad libfaadbin ; then if check_header faad.h; then - check_cc << EOF + check_cc <<EOF #include <faad.h> #ifndef FAAD2_VERSION ok faad1 @@ -2158,7 +2158,7 @@ echo "BUILD_ROOT=\"$PWD\"" >> config.mak # Apparently it's not possible to portably echo a backslash. enabled asmalign_pot && printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH || - printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH + printf '#define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\\n\\t"\n' >> $TMPH echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH

1 0

r15428 - trunk/libavcodec/ra288.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: vitor Date: Fri Sep 26 20:42:06 2008 New Revision: 15428 Log: Simplify: avoid duplication backward_filter() Modified: trunk/libavcodec/ra288.c Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Fri Sep 26 20:42:06 2008 @@ -158,28 +158,18 @@ static void do_hybrid_window(int order, /** * Backward synthesis filter, find the LPC coefficients from past speech data. */ -static void backward_filter(RA288Context *ractx) +static void backward_filter(float *hist, float *rec, const float *window, + float *lpc, const float *tab, + int order, int n, int non_rec, int move_size) { - float temp1[37]; // RTMP in the spec - float temp2[11]; // GPTPMP in the spec - - do_hybrid_window(36, 40, 35, temp1, ractx->sp_hist, - ractx->sp_rec, syn_window); - - if (!compute_lpc_coefs(temp1, 36, ractx->sp_lpc, 0, 1, 1)) - apply_window(ractx->sp_lpc, ractx->sp_lpc, syn_bw_tab, 36); - - do_hybrid_window(10, 8, 20, temp2, ractx->gain_hist, - ractx->gain_rec, gain_window); + float temp[order+1]; - if (!compute_lpc_coefs(temp2, 10, ractx->gain_lpc, 0, 1, 1)) - apply_window(ractx->gain_lpc, ractx->gain_lpc, gain_bw_tab, 10); + do_hybrid_window(order, n, non_rec, temp, hist, rec, window); - memmove(ractx->gain_hist, ractx->gain_hist + 8, - 28*sizeof(*ractx->gain_hist)); + if (!compute_lpc_coefs(temp, order, lpc, 0, 1, 1)) + apply_window(lpc, lpc, tab, order); - memmove(ractx->sp_hist , ractx->sp_hist + 40, - 70*sizeof(*ractx->sp_hist )); + memmove(hist, hist + n, move_size*sizeof(*hist)); } static int ra288_decode_frame(AVCodecContext * avctx, void *data, @@ -212,8 +202,13 @@ static int ra288_decode_frame(AVCodecCon for (j=0; j < 5; j++) *(out++) = ractx->sp_hist[70 + 36 + j]; - if ((i & 7) == 3) - backward_filter(ractx); + if ((i & 7) == 3) { + backward_filter(ractx->sp_hist, ractx->sp_rec, syn_window, + ractx->sp_lpc, syn_bw_tab, 36, 40, 35, 70); + + backward_filter(ractx->gain_hist, ractx->gain_rec, gain_window, + ractx->gain_lpc, gain_bw_tab, 10, 8, 20, 28); + } } *data_size = (char *)out - (char *)data;

1 0

r15427 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: diego Date: Fri Sep 26 20:11:41 2008 New Revision: 15427 Log: Remove unused variable. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Fri Sep 26 20:11:41 2008 @@ -960,7 +960,7 @@ static inline void direct_ref_list_init( MpegEncContext * const s = &h->s; Picture * const ref1 = &h->ref_list[1][0]; Picture * const cur = s->current_picture_ptr; - int list, j, field, rfield; + int list, j, field; int sidx= (s->picture_structure&1)^1; int ref1sidx= (ref1->reference&1)^1;

1 0

r15426 - trunk/libavformat/rmdec.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: banan Date: Fri Sep 26 14:12:25 2008 New Revision: 15426 Log: add ok parts to the rm demuxer for SIPRO support Modified: trunk/libavformat/rmdec.c Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c (original) +++ trunk/libavformat/rmdec.c Fri Sep 26 14:12:25 2008 @@ -127,7 +127,7 @@ static int rm_read_audio_stream_info(AVF } rm->audiobuf = av_malloc(rm->audio_framesize * sub_packet_h); - } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc"))) { + } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) { int codecdata_length, i; get_be16(pb); get_byte(pb); if (((version >> 16) & 0xff) == 5) @@ -139,6 +139,7 @@ static int rm_read_audio_stream_info(AVF } if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK; + else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR; else st->codec->codec_id = CODEC_ID_ATRAC3; st->codec->extradata_size= codecdata_length; st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -557,7 +558,8 @@ ff_rm_parse_packet (AVFormatContext *s, } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { if ((st->codec->codec_id == CODEC_ID_RA_288) || (st->codec->codec_id == CODEC_ID_COOK) || - (st->codec->codec_id == CODEC_ID_ATRAC3)) { + (st->codec->codec_id == CODEC_ID_ATRAC3) || + (st->codec->codec_id == CODEC_ID_SIPR)) { int x; int sps = rm->sub_packet_size; int cfs = rm->coded_framesize;

1 0

r15425 - in trunk: libavcodec/avcodec.h libavformat/riff.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: banan Date: Fri Sep 26 12:59:42 2008 New Revision: 15425 Log: Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work Modified: trunk/libavcodec/avcodec.h trunk/libavformat/riff.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Fri Sep 26 12:59:42 2008 @@ -304,6 +304,7 @@ enum CodecID { CODEC_ID_WMALOSSLESS, CODEC_ID_ATRAC3P, CODEC_ID_EAC3, + CODEC_ID_SIPR, /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, Modified: trunk/libavformat/riff.c ============================================================================== --- trunk/libavformat/riff.c (original) +++ trunk/libavformat/riff.c Fri Sep 26 12:59:42 2008 @@ -189,6 +189,7 @@ const AVCodecTag codec_wav_tags[] = { { CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */ { CODEC_ID_VOXWARE, 0x0075 }, { CODEC_ID_AAC, 0x00ff }, + { CODEC_ID_SIPR, 0x0130 }, { CODEC_ID_WMAV1, 0x0160 }, { CODEC_ID_WMAV2, 0x0161 }, { CODEC_ID_WMAPRO, 0x0162 },

1 0

r15423 - trunk/libavdevice/vfwcap.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: bcoudurier Date: Fri Sep 26 05:20:35 2008 New Revision: 15423 Log: sync to latest mingw api, remove no more needed struct definitions Modified: trunk/libavdevice/vfwcap.c Modified: trunk/libavdevice/vfwcap.c ============================================================================== --- trunk/libavdevice/vfwcap.c (original) +++ trunk/libavdevice/vfwcap.c Fri Sep 26 05:20:35 2008 @@ -43,42 +43,6 @@ #define BI_RGB 0 -typedef struct videohdr_tag { - LPBYTE lpData; - DWORD dwBufferLength; - DWORD dwBytesUsed; - DWORD dwTimeCaptured; - DWORD dwUser; - DWORD dwFlags; - DWORD_PTR dwReserved[4]; -} VIDEOHDR, NEAR *PVIDEOHDR, FAR * LPVIDEOHDR; - -typedef struct { - DWORD dwRequestMicroSecPerFrame; - BOOL fMakeUserHitOKToCapture; - UINT wPercentDropForError; - BOOL fYield; - DWORD dwIndexSize; - UINT wChunkGranularity; - BOOL fUsingDOSMemory; - UINT wNumVideoRequested; - BOOL fCaptureAudio; - UINT wNumAudioRequested; - UINT vKeyAbort; - BOOL fAbortLeftMouse; - BOOL fAbortRightMouse; - BOOL fLimitEnabled; - UINT wTimeLimit; - BOOL fMCIControl; - BOOL fStepMCIDevice; - DWORD dwMCIStartTime; - DWORD dwMCIStopTime; - BOOL fStepCaptureAt2x; - UINT wStepCaptureAverageFrames; - DWORD dwAudioBufferSize; - BOOL fDisableWriteCache; - UINT AVStreamMaster; -} CAPTUREPARMS; /* End of missing MinGW defines */ struct vfw_ctx {

3 2

[propchange]: r15424 - svn:log
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: diego Revision: 15424 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Do not loose the '\n'. +Do not lose the '\n'.

1 0

r15422 - in trunk/libavformat: Makefile allformats.c assdec.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: michael Date: Fri Sep 26 04:19:21 2008 New Revision: 15422 Log: 2 in 1, an ASS and SSA demuxer. Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2). Added: trunk/libavformat/assdec.c Modified: trunk/libavformat/Makefile trunk/libavformat/allformats.c Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile (original) +++ trunk/libavformat/Makefile Fri Sep 26 04:19:21 2008 @@ -21,6 +21,7 @@ OBJS-$(CONFIG_APE_DEMUXER) OBJS-$(CONFIG_ASF_DEMUXER) += asf.o asfcrypt.o riff.o OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o +OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o OBJS-$(CONFIG_AU_MUXER) += au.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o Modified: trunk/libavformat/allformats.c ============================================================================== --- trunk/libavformat/allformats.c (original) +++ trunk/libavformat/allformats.c Fri Sep 26 04:19:21 2008 @@ -59,6 +59,7 @@ void av_register_all(void) REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); REGISTER_MUXDEMUX (ASF, asf); + REGISTER_DEMUXER (ASS, ass); REGISTER_MUXER (ASF_STREAM, asf_stream); REGISTER_MUXDEMUX (AU, au); REGISTER_MUXDEMUX (AVI, avi); Added: trunk/libavformat/assdec.c ============================================================================== --- (empty file) +++ trunk/libavformat/assdec.c Fri Sep 26 04:19:21 2008 @@ -0,0 +1,186 @@ +/* + * SSA/ASS demuxer + * Copyright (c) 2008 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" + +#define MAX_LINESIZE 2000 + +typedef struct ASSContext{ + uint8_t *event_buffer; + uint8_t **event; + unsigned int event_count; + unsigned int event_index; +}ASSContext; + +static void get_line(ByteIOContext *s, char *buf, int maxlen) +{ + int i = 0; + char c; + + do{ + c = get_byte(s); + if (i < maxlen-1 && c != '\r') + buf[i++] = c; + }while(c != '\n' && c); + + buf[i] = 0; +} + +static int probe(AVProbeData *p) +{ + const char *header= "[Script Info]"; + + if( !memcmp(p->buf , header, strlen(header)) + || !memcmp(p->buf+3, header, strlen(header))) + return AVPROBE_SCORE_MAX; + + return 0; +} + +static int read_close(AVFormatContext *s) +{ + ASSContext *ass = s->priv_data; + + av_freep(&ass->event_buffer); + av_freep(&ass->event); + + return 0; +} + +static int64_t get_pts(const uint8_t *p) +{ + int hour, min, sec, hsec; + + if(sscanf(p, "%*[^,],%d:%d:%d%*c%d", &hour, &min, &sec, &hsec) != 4) + return AV_NOPTS_VALUE; + +// av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d [%s]\n", i, hour, min, sec, hsec, p); + + min+= 60*hour; + sec+= 60*min; + + return sec*100+hsec; +} + +static int event_cmp(uint8_t **a, uint8_t **b) +{ + return get_pts(*a) - get_pts(*b); +} + +static int read_header(AVFormatContext *s, AVFormatParameters *ap) +{ + int i, header_remaining; + ASSContext *ass = s->priv_data; + ByteIOContext *pb = s->pb; + AVStream *st; + int allocated[2]={0}; + uint8_t *p, **dst[2]={0}; + int pos[2]={0}; + + st = av_new_stream(s, 0); + if (!st) + return -1; + av_set_pts_info(st, 64, 1, 100); + st->codec->codec_type = CODEC_TYPE_SUBTITLE; + st->codec->codec_id= CODEC_ID_SSA; + + header_remaining= INT_MAX; + dst[0] = &st->codec->extradata; + dst[1] = &ass->event_buffer; + while(!url_feof(pb)){ + uint8_t line[MAX_LINESIZE]; + + get_line(pb, line, sizeof(line)); + + if(!memcmp(line, "[Events]", 8)) + header_remaining= 2; + else if(line[0]=='[') + header_remaining= INT_MAX; + + i= header_remaining==0; + + if(i && get_pts(line) == AV_NOPTS_VALUE) + continue; + + p = av_fast_realloc(*(dst[i]), &allocated[i], pos[i]+MAX_LINESIZE); + if(!p) + goto fail; + *(dst[i])= p; + memcpy(p + pos[i], line, strlen(line)+1); + pos[i] += strlen(line); + if(i) ass->event_count++; + else header_remaining--; + } + st->codec->extradata_size= pos[0]; + + if(ass->event_count >= UINT_MAX / sizeof(*ass->event)) + goto fail; + + ass->event= av_malloc(ass->event_count * sizeof(*ass->event)); + p= ass->event_buffer; + for(i=0; i<ass->event_count; i++){ + ass->event[i]= p; + while(*p && *p != '\n') + p++; + *p++ = 0; + } + + qsort(ass->event, ass->event_count, sizeof(*ass->event), event_cmp); + + return 0; + +fail: + read_close(s); + + return -1; +} + +static int read_packet(AVFormatContext *s, AVPacket *pkt) +{ + ASSContext *ass = s->priv_data; + uint8_t *p; + + if(ass->event_index >= ass->event_count) + return AVERROR(EIO); + + p= ass->event[ ass->event_index ]; + + av_new_packet(pkt, strlen(p)); + pkt->flags |= PKT_FLAG_KEY; + pkt->pos= p - ass->event_buffer + s->streams[0]->codec->extradata_size; + pkt->pts= pkt->dts= get_pts(p); + memcpy(pkt->data, p, pkt->size); + + ass->event_index++; + + return 0; +} + +AVInputFormat ass_demuxer = { + "ass", + NULL_IF_CONFIG_SMALL("SSA/ASS format"), + sizeof(ASSContext), + probe, + read_header, + read_packet, + read_close, +// read_seek, +};

1 0

r15421 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: bcoudurier Date: Fri Sep 26 04:13:38 2008 New Revision: 15421 Log: include sys/select.h, fix freebsd 5.5 compilation Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Fri Sep 26 04:13:38 2008 @@ -48,6 +48,10 @@ #include <windows.h> #endif +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif + #if defined(HAVE_TERMIOS_H) #include <fcntl.h> #include <sys/ioctl.h>

1 0

r15420 - in trunk/libavformat: rtsp.c tcp.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: bcoudurier Date: Fri Sep 26 04:12:37 2008 New Revision: 15420 Log: only include sys/select.h if present, fix mingw compilation Modified: trunk/libavformat/rtsp.c trunk/libavformat/tcp.c Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Fri Sep 26 04:12:37 2008 @@ -26,7 +26,9 @@ #include "avformat.h" #include <sys/time.h> +#ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#endif #include <strings.h> #include "network.h" #include "rtsp.h" Modified: trunk/libavformat/tcp.c ============================================================================== --- trunk/libavformat/tcp.c (original) +++ trunk/libavformat/tcp.c Fri Sep 26 04:12:37 2008 @@ -22,7 +22,9 @@ #include <unistd.h> #include "network.h" #include "os_support.h" +#ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#endif #include <sys/time.h> typedef struct TCPContext {

1 0

r15419 - trunk/libavformat/img2.c
by subversion＠mplayerhq.hu 26 Sep '08

26 Sep '08

Author: michael Date: Fri Sep 26 04:07:56 2008 New Revision: 15419 Log: Prevent image2 from complaining about non monotone timestamps as there are no timestamps in "raw" image2. Modified: trunk/libavformat/img2.c Modified: trunk/libavformat/img2.c ============================================================================== --- trunk/libavformat/img2.c (original) +++ trunk/libavformat/img2.c Fri Sep 26 04:07:56 2008 @@ -409,7 +409,7 @@ AVOutputFormat image2_muxer = { img_write_header, img_write_packet, NULL, - AVFMT_NOFILE, + .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE }; #endif #ifdef CONFIG_IMAGE2PIPE_MUXER @@ -423,5 +423,6 @@ AVOutputFormat image2pipe_muxer = { CODEC_ID_MJPEG, img_write_header, img_write_packet, + .flags= AVFMT_NOTIMESTAMPS }; #endif

1 0

r15418 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 23:44:07 2008 New Revision: 15418 Log: Avoid out of picture accesses when CODEC_FLAG_EMU_EDGE is set. Fixes issue427. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Thu Sep 25 23:44:07 2008 @@ -2391,7 +2391,7 @@ static inline void xchg_mb_border(H264Co deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy]; } else { deblock_left = (s->mb_x > 0); - deblock_top = (s->mb_y > 0); + deblock_top = (s->mb_y > !!MB_FIELD); } src_y -= linesize + 1;

1 0

r15404 - trunk/libavcodec/ra288.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: vitor Date: Wed Sep 24 22:31:24 2008 New Revision: 15404 Log: Move constant multiplication out of the loop Modified: trunk/libavcodec/ra288.c Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Wed Sep 24 22:31:24 2008 @@ -96,12 +96,12 @@ static void decode(RA288Context *ractx, /* block 48 of G.728 spec */ /* exp(sum * 0.1151292546497) == pow(10.0,sum/20) */ - sumsum = exp(sum * 0.1151292546497) * gain / 2048.; + sumsum = exp(sum * 0.1151292546497) * gain / (2048 * 4096); for (i=0; i < 5; i++) buffer[i] = codetable[cb_coef][i] * sumsum; - sum = scalar_product_float(buffer, buffer, 5) / 5; + sum = (4096 * 4096) * scalar_product_float(buffer, buffer, 5) / 5; sum = FFMAX(sum, 1); @@ -118,7 +118,7 @@ static void decode(RA288Context *ractx, /* output */ for (i=0; i < 5; i++) - block[i] = av_clipf(block[i], -4095, 4095); + block[i] = av_clipf(block[i], -4095./4096., 4095./4096.); } /** @@ -210,7 +210,7 @@ static int ra288_decode_frame(AVCodecCon decode(ractx, gain, cb_coef); for (j=0; j < 5; j++) - *(out++) = (1/4096.) * ractx->sp_hist[70 + 36 + j]; + *(out++) = ractx->sp_hist[70 + 36 + j]; if ((i & 7) == 3) backward_filter(ractx);

3 2

r15417 - trunk/libavcodec/ra288.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: vitor Date: Thu Sep 25 22:03:57 2008 New Revision: 15417 Log: Do instead of divising a float by a constant, multiply by its inverse Modified: trunk/libavcodec/ra288.c Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Thu Sep 25 22:03:57 2008 @@ -96,12 +96,12 @@ static void decode(RA288Context *ractx, /* block 48 of G.728 spec */ /* exp(sum * 0.1151292546497) == pow(10.0,sum/20) */ - sumsum = exp(sum * 0.1151292546497) * gain / (2048 * 4096); + sumsum = exp(sum * 0.1151292546497) * gain * (1.0/(1<<23)); for (i=0; i < 5; i++) buffer[i] = codetable[cb_coef][i] * sumsum; - sum = (4096 * 4096) * scalar_product_float(buffer, buffer, 5) / 5; + sum = scalar_product_float(buffer, buffer, 5) * ((1<<24)/5.); sum = FFMAX(sum, 1);

1 0

r15416 - trunk/libavcodec/error_resilience.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 21:25:28 2008 New Revision: 15416 Log: Ensure that no non-existing frame is used. Fixes issue624. Modified: trunk/libavcodec/error_resilience.c Modified: trunk/libavcodec/error_resilience.c ============================================================================== --- trunk/libavcodec/error_resilience.c (original) +++ trunk/libavcodec/error_resilience.c Thu Sep 25 21:25:28 2008 @@ -551,7 +551,7 @@ score_sum+= best_score; static int is_intra_more_likely(MpegEncContext *s){ int is_intra_likely, i, j, undamaged_count, skip_amount, mb_x, mb_y; - if(s->last_picture_ptr==NULL) return 1; //no previous frame available -> use spatial prediction + if(!s->last_picture_ptr || !s->last_picture_ptr->data[0]) return 1; //no previous frame available -> use spatial prediction undamaged_count=0; for(i=0; i<s->mb_num; i++){

1 0

r15415 - in trunk/libavutil: avutil.h rational.c rational.h
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: stefano Date: Thu Sep 25 21:23:13 2008 New Revision: 15415 Log: Implement av_nearer_q() and av_find_nearest_q_idx() functions. Modified: trunk/libavutil/avutil.h trunk/libavutil/rational.c trunk/libavutil/rational.h Modified: trunk/libavutil/avutil.h ============================================================================== --- trunk/libavutil/avutil.h (original) +++ trunk/libavutil/avutil.h Thu Sep 25 21:23:13 2008 @@ -35,7 +35,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 49 -#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MINOR 11 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ Modified: trunk/libavutil/rational.c ============================================================================== --- trunk/libavutil/rational.c (original) +++ trunk/libavutil/rational.c Thu Sep 25 21:23:13 2008 @@ -101,3 +101,28 @@ AVRational av_d2q(double d, int max){ return a; } + +int av_nearer_q(AVRational q, AVRational q1, AVRational q2) +{ + /* n/d is q, a/b is the median between q1 and q2 */ + int64_t a = q1.num * (int64_t)q2.den + q2.num * (int64_t)q1.den; + int64_t b = 2 * (int64_t)q1.den * q2.den; + + /* rnd_up(a*d/b) > n => a*d/b > n */ + int64_t x_up = av_rescale_rnd(a, q.den, b, AV_ROUND_UP); + + /* rnd_down(a*d/b) < n => a*d/b < n */ + int64_t x_down = av_rescale_rnd(a, q.den, b, AV_ROUND_DOWN); + + return ((x_up > q.num) - (x_down < q.num)) * av_cmp_q(q2, q1); +} + +int av_find_nearest_q_idx(AVRational q, const AVRational* q_list) +{ + int i, nearest_q_idx = 0; + for(i=0; q_list[i].den; i++) + if (av_nearer_q(q, q_list[i], q_list[nearest_q_idx]) > 0) + nearest_q_idx = i; + + return nearest_q_idx; +} Modified: trunk/libavutil/rational.h ============================================================================== --- trunk/libavutil/rational.h (original) +++ trunk/libavutil/rational.h Thu Sep 25 21:23:13 2008 @@ -113,4 +113,17 @@ AVRational av_sub_q(AVRational b, AVRati */ AVRational av_d2q(double d, int max) av_const; +/** + * @return 1 if \q1 is nearer to \p q than \p q2, -1 if \p q2 is nearer + * than \p q1, 0 if they have the same distance. + */ +int av_nearer_q(AVRational q, AVRational q1, AVRational q2); + +/** + * Finds the nearest value in \p q_list to \p q. + * @param q_list an array of rationals terminated by {0, 0} + * @return the index of the nearest value found in the array + */ +int av_find_nearest_q_idx(AVRational q, const AVRational* q_list); + #endif /* AVUTIL_RATIONAL_H */

1 0

r15414 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 21:01:39 2008 New Revision: 15414 Log: Do not free sps & pps on width/height changes. Fixes issue557. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Thu Sep 25 21:01:39 2008 @@ -2034,12 +2034,6 @@ static void free_tables(H264Context *h){ av_freep(&h->mb2b_xy); av_freep(&h->mb2b8_xy); - for(i = 0; i < MAX_SPS_COUNT; i++) - av_freep(h->sps_buffers + i); - - for(i = 0; i < MAX_PPS_COUNT; i++) - av_freep(h->pps_buffers + i); - for(i = 0; i < h->s.avctx->thread_count; i++) { hx = h->thread_context[i]; if(!hx) continue; @@ -7920,10 +7914,18 @@ static av_cold int decode_end(AVCodecCon { H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; + int i; av_freep(&h->rbsp_buffer[0]); av_freep(&h->rbsp_buffer[1]); free_tables(h); //FIXME cleanup init stuff perhaps + + for(i = 0; i < MAX_SPS_COUNT; i++) + av_freep(h->sps_buffers + i); + + for(i = 0; i < MAX_PPS_COUNT; i++) + av_freep(h->pps_buffers + i); + MPV_common_end(s); // memset(h, 0, sizeof(H264Context));

1 0

r15413 - trunk/libavcodec/mpegvideo.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 16:34:14 2008 New Revision: 15413 Log: Do not use the generic "alloc missing references" code for h.264 as it does not work correctly in that case. Fixes issue652. Modified: trunk/libavcodec/mpegvideo.c Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Thu Sep 25 16:34:14 2008 @@ -894,7 +894,7 @@ alloc: if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr); if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); - if(s->pict_type != FF_I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable){ + if(s->pict_type != FF_I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable && s->codec_id != CODEC_ID_H264){ av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); assert(s->pict_type != FF_B_TYPE); //these should have been dropped if we don't have a reference goto alloc;

1 0

r15412 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 16:29:35 2008 New Revision: 15412 Log: Initialize next/last_picture* as the generic code does not always set them to sane values. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Thu Sep 25 16:29:35 2008 @@ -3925,6 +3925,15 @@ static int decode_slice_header(H264Conte if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0) return -1; + if(h->slice_type_nos!=FF_I_TYPE){ + s->last_picture_ptr= &h->ref_list[0][0]; + copy_picture(&s->last_picture, s->last_picture_ptr); + } + if(h->slice_type_nos==FF_B_TYPE){ + s->next_picture_ptr= &h->ref_list[1][0]; + copy_picture(&s->next_picture, s->next_picture_ptr); + } + if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) ) pred_weight_table(h);

1 0

r15411 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 14:04:25 2008 New Revision: 15411 Log: Print which slices are IDR not just the slice type. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Thu Sep 25 14:04:25 2008 @@ -4036,11 +4036,11 @@ static int decode_slice_header(H264Conte h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; if(s->avctx->debug&FF_DEBUG_PICT_INFO){ - av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", + av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", h->slice_num, (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), first_mb_in_slice, - av_get_pict_type_char(h->slice_type), + av_get_pict_type_char(h->slice_type), h->slice_type_fixed ? " fix" : "", h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", pps_id, h->frame_num, s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], h->ref_count[0], h->ref_count[1],

1 0

[propchange]: r15408 - svn:log
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: diego Revision: 15408 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -skip non valid audio samples in gxf packets \ No newline at end of file +skip invalid audio samples in gxf packets

1 0

r15410 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 Sep '08

25 Sep '08

Author: michael Date: Thu Sep 25 02:41:49 2008 New Revision: 15410 Log: Fix CAVLC+8x8+MBAFF loop filter. Fixes FREXT02_JVC_C. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Thu Sep 25 02:41:49 2008 @@ -6383,8 +6383,10 @@ static void filter_mb( H264Context *h, i if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) bS[i] = 4; else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || - /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ - h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) + ((!h->pps.cabac && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])) ? + (h->cbp_table[mbn_xy] & ((MB_FIELD ? (i&2) : (mb_y&1)) ? 8 : 2)) + : + h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2])) bS[i] = 2; else bS[i] = 1;

1 0

r15409 - trunk/libavformat/gxf.c
by subversion＠mplayerhq.hu 24 Sep '08

24 Sep '08

Author: bcoudurier Date: Thu Sep 25 01:40:55 2008 New Revision: 15409 Log: cosmetics, remove GXF: in log messages since it is present in context Modified: trunk/libavformat/gxf.c Modified: trunk/libavformat/gxf.c ============================================================================== --- trunk/libavformat/gxf.c (original) +++ trunk/libavformat/gxf.c Thu Sep 25 01:40:55 2008 @@ -238,11 +238,11 @@ static void gxf_read_index(AVFormatConte int i; pkt_len -= 8; if (map_cnt > 1000) { - av_log(s, AV_LOG_ERROR, "GXF: too many index entries %u (%x)\n", map_cnt, map_cnt); + av_log(s, AV_LOG_ERROR, "too many index entries %u (%x)\n", map_cnt, map_cnt); map_cnt = 1000; } if (pkt_len < 4 * map_cnt) { - av_log(s, AV_LOG_ERROR, "GXF: invalid index length\n"); + av_log(s, AV_LOG_ERROR, "invalid index length\n"); url_fskip(pb, pkt_len); return; } @@ -263,18 +263,18 @@ static int gxf_header(AVFormatContext *s st_info_t si; int i; if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) { - av_log(s, AV_LOG_ERROR, "GXF: map packet not found\n"); + av_log(s, AV_LOG_ERROR, "map packet not found\n"); return 0; } map_len -= 2; if (get_byte(pb) != 0x0e0 || get_byte(pb) != 0xff) { - av_log(s, AV_LOG_ERROR, "GXF: unknown version or invalid map preamble\n"); + av_log(s, AV_LOG_ERROR, "unknown version or invalid map preamble\n"); return 0; } map_len -= 2; len = get_be16(pb); // length of material data section if (len > map_len) { - av_log(s, AV_LOG_ERROR, "GXF: material data longer than map data\n"); + av_log(s, AV_LOG_ERROR, "material data longer than map data\n"); return 0; } map_len -= len; @@ -283,7 +283,7 @@ static int gxf_header(AVFormatContext *s map_len -= 2; len = get_be16(pb); // length of track description if (len > map_len) { - av_log(s, AV_LOG_ERROR, "GXF: track description longer than map data\n"); + av_log(s, AV_LOG_ERROR, "track description longer than map data\n"); return 0; } map_len -= len; @@ -299,12 +299,12 @@ static int gxf_header(AVFormatContext *s gxf_track_tags(pb, &track_len, &si); url_fskip(pb, track_len); if (!(track_type & 0x80)) { - av_log(s, AV_LOG_ERROR, "GXF: invalid track type %x\n", track_type); + av_log(s, AV_LOG_ERROR, "invalid track type %x\n", track_type); continue; } track_type &= 0x7f; if ((track_id & 0xc0) != 0xc0) { - av_log(s, AV_LOG_ERROR, "GXF: invalid track id %x\n", track_id); + av_log(s, AV_LOG_ERROR, "invalid track id %x\n", track_id); continue; } track_id &= 0x3f; @@ -320,17 +320,17 @@ static int gxf_header(AVFormatContext *s st->duration = si.last_field - si.first_field; } if (len < 0) - av_log(s, AV_LOG_ERROR, "GXF: invalid track description length specified\n"); + av_log(s, AV_LOG_ERROR, "invalid track description length specified\n"); if (map_len) url_fskip(pb, map_len); if (!parse_packet_header(pb, &pkt_type, &len)) { - av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n"); + av_log(s, AV_LOG_ERROR, "sync lost in header\n"); return -1; } if (pkt_type == PKT_FLT) { gxf_read_index(s, len); if (!parse_packet_header(pb, &pkt_type, &len)) { - av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n"); + av_log(s, AV_LOG_ERROR, "sync lost in header\n"); return -1; } } @@ -347,9 +347,9 @@ static int gxf_header(AVFormatContext *s main_timebase.den = fps.num; } } else - av_log(s, AV_LOG_INFO, "GXF: UMF packet too short\n"); + av_log(s, AV_LOG_INFO, "UMF packet too short\n"); } else - av_log(s, AV_LOG_INFO, "GXF: UMF packet missing\n"); + av_log(s, AV_LOG_INFO, "UMF packet missing\n"); url_fskip(pb, len); if (!main_timebase.num || !main_timebase.den) main_timebase = (AVRational){1, 50}; // set some arbitrary fallback @@ -421,7 +421,7 @@ static int gxf_packet(AVFormatContext *s int stream_index; if (!parse_packet_header(pb, &pkt_type, &pkt_len)) { if (!url_feof(pb)) - av_log(s, AV_LOG_ERROR, "GXF: sync lost\n"); + av_log(s, AV_LOG_ERROR, "sync lost\n"); return -1; } if (pkt_type == PKT_FLT) { @@ -433,7 +433,7 @@ static int gxf_packet(AVFormatContext *s continue; } if (pkt_len < 16) { - av_log(s, AV_LOG_ERROR, "GXF: invalid media packet length\n"); + av_log(s, AV_LOG_ERROR, "invalid media packet length\n"); continue; } pkt_len -= 16;

1 0

r15408 - trunk/libavformat/gxf.c
by subversion＠mplayerhq.hu 24 Sep '08

24 Sep '08

Author: bcoudurier Date: Thu Sep 25 01:31:04 2008 New Revision: 15408 Log: skip non valid audio samples in gxf packets Modified: trunk/libavformat/gxf.c Modified: trunk/libavformat/gxf.c ============================================================================== --- trunk/libavformat/gxf.c (original) +++ trunk/libavformat/gxf.c Thu Sep 25 01:31:04 2008 @@ -415,8 +415,9 @@ static int gxf_packet(AVFormatContext *s pkt_type_t pkt_type; int pkt_len; while (!url_feof(pb)) { + AVStream *st; int track_type, track_id, ret; - int field_nr; + int field_nr, field_info, skip = 0; int stream_index; if (!parse_packet_header(pb, &pkt_type, &pkt_len)) { if (!url_feof(pb)) @@ -441,15 +442,27 @@ static int gxf_packet(AVFormatContext *s stream_index = get_sindex(s, track_id, track_type); if (stream_index < 0) return stream_index; + st = s->streams[stream_index]; field_nr = get_be32(pb); - get_be32(pb); // field information + field_info = get_be32(pb); get_be32(pb); // "timeline" field number get_byte(pb); // flags get_byte(pb); // reserved - // NOTE: there is also data length information in the - // field information, it might be better to take this into account - // as well. + if (st->codec->codec_id == CODEC_ID_PCM_S24LE || + st->codec->codec_id == CODEC_ID_PCM_S16LE) { + int first = field_info >> 16; + int last = field_info & 0xffff; // last is exclusive + int bps = av_get_bits_per_sample(st->codec->codec_id)>>3; + if (first <= last && last*bps <= pkt_len) { + url_fskip(pb, first*bps); + skip = pkt_len - last*bps; + pkt_len = (last-first)*bps; + } else + av_log(s, AV_LOG_ERROR, "invalid first and last sample values\n"); + } ret = av_get_packet(pb, pkt, pkt_len); + if (skip) + url_fskip(pb, skip); pkt->stream_index = stream_index; pkt->dts = field_nr; return ret;

1 0