October 2006 - ffmpeg-cvslog - lists.ffmpeg.org

r6831 - in trunk/libavformat: rtp.c rtp_internal.h rtsp.c
by subversion＠mplayerhq.hu 29 Oct '06

29 Oct '06

Author: gpoirier Date: Sun Oct 29 11:58:51 2006 New Revision: 6831 Modified: trunk/libavformat/rtp.c trunk/libavformat/rtp_internal.h trunk/libavformat/rtsp.c Log: fix more dynamic protocol stuff, needed by the forthcoming h264 streaming patch. (Minor additions to give more information to the dynamic protocol handlers, and a slight rearrangement of code.) Patch by Ryan Martell %rdm4 A martellventures P com% Original thread: Date: Oct 29, 2006 2:30 AM Subject: Re: [Ffmpeg-devel] RTP patches & RFC Modified: trunk/libavformat/rtp.c ============================================================================== --- trunk/libavformat/rtp.c (original) +++ trunk/libavformat/rtp.c Sun Oct 29 11:58:51 2006 @@ -328,6 +328,7 @@ * open a new RTP parse context for stream 'st'. 'st' can be NULL for * MPEG2TS streams to indicate that they should be demuxed inside the * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned) + * TODO: change this to not take rtp_payload data, and use the new dynamic payload system. */ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, rtp_payload_data_t *rtp_payload_data) { @@ -419,6 +420,39 @@ } /** + * This was the second switch in rtp_parse packet. Normalizes time, if required, sets stream_index, etc. + */ +static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) +{ + switch(s->st->codec->codec_id) { + case CODEC_ID_MP2: + case CODEC_ID_MPEG1VIDEO: + if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { + int64_t addend; + + int delta_timestamp; + /* XXX: is it really necessary to unify the timestamp base ? */ + /* compute pts from timestamp with received ntp_time */ + delta_timestamp = timestamp - s->last_rtcp_timestamp; + /* convert to 90 kHz without overflow */ + addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; + addend = (addend * 5625) >> 14; + pkt->pts = addend + delta_timestamp; + } + break; + case CODEC_ID_MPEG4AAC: + case CODEC_ID_H264: + case CODEC_ID_MPEG4: + pkt->pts = timestamp; + break; + default: + /* no timestamp info yet */ + break; + } + pkt->stream_index = s->st->index; +} + +/** * Parse an RTP or RTCP packet directly sent as a buffer. * @param s RTP parse context. * @param pkt returned packet @@ -431,15 +465,20 @@ const uint8_t *buf, int len) { unsigned int ssrc, h; - int payload_type, seq, delta_timestamp, ret; + int payload_type, seq, ret; AVStream *st; uint32_t timestamp; + int rv= 0; if (!buf) { /* return the next packets, if any */ if(s->st && s->parse_packet) { - return s->parse_packet(s, pkt, 0, NULL, 0); + timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... + rv= s->parse_packet(s, pkt, &timestamp, NULL, 0); + finalize_packet(s, pkt, timestamp); + return rv; } else { + // TODO: Move to a dynamic packet handler (like above) if (s->read_buf_index >= s->read_buf_size) return -1; ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, @@ -548,12 +587,11 @@ } s->read_buf_size = len; s->buf_ptr = buf; - pkt->stream_index = s->st->index; - return 0; ///< Temporary return. + rv= 0; break; default: if(s->parse_packet) { - return s->parse_packet(s, pkt, timestamp, buf, len); + rv= s->parse_packet(s, pkt, &timestamp, buf, len); } else { av_new_packet(pkt, len); memcpy(pkt->data, buf, len); @@ -561,32 +599,10 @@ break; } - switch(st->codec->codec_id) { - case CODEC_ID_MP2: - case CODEC_ID_MPEG1VIDEO: - if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { - int64_t addend; - /* XXX: is it really necessary to unify the timestamp base ? */ - /* compute pts from timestamp with received ntp_time */ - delta_timestamp = timestamp - s->last_rtcp_timestamp; - /* convert to 90 kHz without overflow */ - addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; - addend = (addend * 5625) >> 14; - pkt->pts = addend + delta_timestamp; - } - break; - case CODEC_ID_MPEG4AAC: - case CODEC_ID_H264: - case CODEC_ID_MPEG4: - pkt->pts = timestamp; - break; - default: - /* no timestamp info yet */ - break; - } - pkt->stream_index = s->st->index; + // now perform timestamp things.... + finalize_packet(s, pkt, timestamp); } - return 0; + return rv; } void rtp_parse_close(RTPDemuxContext *s) Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Sun Oct 29 11:58:51 2006 @@ -25,7 +25,7 @@ typedef int (*DynamicPayloadPacketHandlerProc) (struct RTPDemuxContext * s, AVPacket * pkt, - uint32_t timestamp, + uint32_t *timestamp, const uint8_t * buf, int len); Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Sun Oct 29 11:58:51 2006 @@ -200,6 +200,8 @@ i = atoi(buf); if (i > 0) codec->channels = i; + // TODO: there is a bug here; if it is a mono stream, and less than 22000Hz, faad upconverts to stereo and twice the + // frequency. No problem, but the sample rate is being set here by the sdp line. Upcoming patch forthcoming. (rdm) } av_log(codec, AV_LOG_DEBUG, " audio samplerate set to : %i\n", codec->sample_rate); av_log(codec, AV_LOG_DEBUG, " audio channels set to : %i\n", codec->channels); @@ -287,6 +289,25 @@ {NULL, -1, -1}, }; +/** parse the attribute line from the fmtp a line of an sdp resonse. This is broken out as a function +* because it is used in rtp_h264.c, which is forthcoming. +*/ +int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size) +{ + skip_spaces(p); + if(**p) + { + get_word_sep(attr, attr_size, "=", p); + if (**p == '=') + (*p)++; + get_word_sep(value, value_size, ";", p); + if (**p == ';') + (*p)++; + return 1; + } + return 0; +} + /* parse a SDP line and save stream attributes */ static void sdp_parse_fmtp(AVStream *st, const char *p) { @@ -298,6 +319,7 @@ AVCodecContext *codec = st->codec; rtp_payload_data_t *rtp_payload_data = &rtsp_st->rtp_payload_data; + // TODO (Replace with rtsp_next_attr_and_value) /* loop on each attribute */ for(;;) { skip_spaces(&p); @@ -471,6 +493,19 @@ } } } + } else if(strstart(p, "framesize:", &p)) { + // let dynamic protocol handlers have a stab at the line. + get_word(buf1, sizeof(buf1), &p); + payload_type = atoi(buf1); + for(i = 0; i < s->nb_streams;i++) { + st = s->streams[i]; + rtsp_st = st->priv_data; + if (rtsp_st->sdp_payload_type == payload_type) { + if(rtsp_st->dynamic_handler && rtsp_st->dynamic_handler->parse_sdp_a_line) { + rtsp_st->dynamic_handler->parse_sdp_a_line(st, rtsp_st->dynamic_protocol_context, buf); + } + } + } } break; }

1 0

r6830 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 22:18:18 2006 New Revision: 6830 Modified: trunk/libavcodec/eval.c Log: update copyright year, it looks odd otherwise :) Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 22:18:18 2006 @@ -1,7 +1,7 @@ /* * simple arithmetic expression evaluator * - * Copyright (c) 2002 Michael Niedermayer <michaelni at gmx.at> + * Copyright (c) 2002-2006 Michael Niedermayer <michaelni at gmx.at> * Copyright (c) 2006 Oded Shimon <ods15 at ods15.dyndns.org> * * This file is part of FFmpeg.

1 0

r6829 - trunk/libavcodec/motion_est.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 22:00:05 2006 New Revision: 6829 Modified: trunk/libavcodec/motion_est.c Log: CANDIDATE_MB_TYPE_INTER heuristic doesnt work at really low quality where the distortion becomes less relevant then the overhead of intra blocks Modified: trunk/libavcodec/motion_est.c ============================================================================== --- trunk/libavcodec/motion_est.c (original) +++ trunk/libavcodec/motion_est.c Sat Oct 28 22:00:05 2006 @@ -1299,7 +1299,8 @@ if (vard*2 + 200*256 > varc) mb_type|= CANDIDATE_MB_TYPE_INTRA; - if (varc*2 + 200*256 > vard){ + if (varc*2 + 200*256 > vard || s->qscale > 24){ +// if (varc*2 + 200*256 + 50*(s->lambda2>>FF_LAMBDA_SHIFT) > vard){ mb_type|= CANDIDATE_MB_TYPE_INTER; c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); if(s->flags&CODEC_FLAG_MV0)

1 0

r6828 - trunk/libavformat/nsvdec.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: gpoirier Date: Sat Oct 28 20:39:16 2006 New Revision: 6828 Modified: trunk/libavformat/nsvdec.c Log: add support for all framerates specified by the standard Patch by Joakim elupus A ecce P se Original thread: Date: Oct 28, 2006 7:56 PM Subject: [Ffmpeg-devel] [PATCH] Support for all official framerates in nsv demuxer Modified: trunk/libavformat/nsvdec.c ============================================================================== --- trunk/libavformat/nsvdec.c (original) +++ trunk/libavformat/nsvdec.c Sat Oct 28 20:39:16 2006 @@ -40,6 +40,8 @@ * seems someone came to the same conclusions as me, and updated it: * (2) http://www.stud.ktu.lt/~vitslav/nsv/nsv-format.txt * http://www.stud.ktu.lt/~vitslav/nsv/ + * official docs + * (3) http://ultravox.aol.com/NSVFormat.rtf * Sample files: * (S1) http://www.nullsoft.com/nsv/samples/ * http://www.nullsoft.com/nsv/samples/faster.nsv @@ -208,15 +210,6 @@ { 0, 0 }, }; -static const AVRational nsv_framerate_table[] = { - {30,1}, - {30000,1001}, - {25,1}, - {24000,1001}, - {30,1}, - {15000,1001}, -}; - //static int nsv_load_index(AVFormatContext *s); static int nsv_read_chunk(AVFormatContext *s, int fill_header); @@ -415,11 +408,25 @@ vwidth = get_le16(pb); vheight = get_le16(pb); i = get_byte(pb); - /* XXX how big must the table be ? */ - /* seems there is more to that... */ + PRINT(("NSV NSVs framerate code %2x\n", i)); - if(i&0x80) framerate= nsv_framerate_table[i & 0x7F]; - else framerate= (AVRational){i, 1}; + if(i&0x80) { /* odd way of giving native framerates from docs */ + int t=(i & 0x7F)>>2; + if(t<16) framerate = (AVRational){1, t+1}; + else framerate = (AVRational){t-15, 1}; + + if(i&1){ + framerate.num *= 1000; + framerate.den *= 1001; + } + + if((i&3)==3) framerate.num *= 24; + else if((i&3)==2) framerate.num *= 25; + else framerate.num *= 30; + } + else + framerate= (AVRational){i, 1}; + nsv->avsync = get_le16(pb); #ifdef DEBUG print_tag("NSV NSVs vtag", vtag, 0);

1 0

r6827 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: ods15 Date: Sat Oct 28 20:30:20 2006 New Revision: 6827 Modified: trunk/libavcodec/eval.c Log: I hope noone minds, adding myself to eval.c copyright... Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 20:30:20 2006 @@ -2,6 +2,7 @@ * simple arithmetic expression evaluator * * Copyright (c) 2002 Michael Niedermayer <michaelni at gmx.at> + * Copyright (c) 2006 Oded Shimon <ods15 at ods15.dyndns.org> * * This file is part of FFmpeg. *

1 0

r6826 - trunk/libavformat/nsvdec.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: gpoirier Date: Sat Oct 28 19:28:04 2006 New Revision: 6826 Modified: trunk/libavformat/nsvdec.c Log: Fix A/V (de)sync with discontinuous NSV streams, Patch by Joakim elupus A ecce P se Original thread: Subject: [Ffmpeg-devel] [PATCH]: A/V sync on nsv streams. Date: October 27, 2006 3:18:54 AM CEDT Actual committed patch: Date: October 28, 2006 3:23:28 AM CEDT Modified: trunk/libavformat/nsvdec.c ============================================================================== --- trunk/libavformat/nsvdec.c (original) +++ trunk/libavformat/nsvdec.c Sat Oct 28 19:28:04 2006 @@ -177,6 +177,7 @@ int64_t duration; uint32_t vtag, atag; uint16_t vwidth, vheight; + int16_t avsync; //DVDemuxContext* dv_demux; } NSVContext; @@ -405,7 +406,6 @@ uint16_t vwidth, vheight; AVRational framerate; int i; - uint16_t unknown; AVStream *st; NSVStream *nst; PRINT(("%s()\n", __FUNCTION__)); @@ -420,7 +420,7 @@ PRINT(("NSV NSVs framerate code %2x\n", i)); if(i&0x80) framerate= nsv_framerate_table[i & 0x7F]; else framerate= (AVRational){i, 1}; - unknown = get_le16(pb); + nsv->avsync = get_le16(pb); #ifdef DEBUG print_tag("NSV NSVs vtag", vtag, 0); print_tag("NSV NSVs atag", atag, 0); @@ -466,15 +466,13 @@ st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = atag; st->codec->codec_id = codec_get_id(nsv_codec_audio_tags, atag); - st->start_time = 0; -// st->duration = nsv->duration; //FIXME st->need_parsing = 1; /* for PCM we will read a chunk later and put correct info */ - /* XXX:FIXME */ - //st->codec->channels = 2; //XXX:channels; - //st->codec->sample_rate = 1000; - //av_set_pts_info(st, 64, 1, st->codec->sample_rate); + /* set timebase to common denominator of ms and framerate */ + av_set_pts_info(st, 64, 1, framerate.num*1000); + st->start_time = 0; + st->duration = (int64_t)nsv->duration * framerate.num; #endif } #ifdef CHECK_SUBSEQUENT_NSVS @@ -598,7 +596,7 @@ av_get_packet(pb, pkt, vsize); pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO; pkt->dts = nst->frame_offset++; - pkt->flags |= PKT_FLAG_KEY; /* stupid format has no way to tell XXX: try the index */ + pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ /* for (i = 0; i < MIN(8, vsize); i++) PRINT(("NSV video: [%d] = %02x\n", i, pkt->data[i])); @@ -630,20 +628,22 @@ channels = 1; st[NSV_ST_AUDIO]->codec->channels = channels; st[NSV_ST_AUDIO]->codec->sample_rate = samplerate; - av_set_pts_info(st[NSV_ST_AUDIO], 64, 1, - st[NSV_ST_AUDIO]->codec->sample_rate); PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate)); } } av_get_packet(pb, pkt, asize); pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO; - //pkt->dts = nst->frame_offset; - //if (nst->sample_size) - // pkt->dts /= nst->sample_size; - nst->frame_offset += asize; // XXX: that's valid only for PCM !? + pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */ + if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) { + /* on a nsvs frame we have new information on a/v sync */ + pkt->dts = (((NSVStream*)st[NSV_ST_VIDEO]->priv_data)->frame_offset-1); + pkt->dts *= (int64_t)1000 * st[NSV_ST_VIDEO]->time_base.num; + pkt->dts += (int64_t)nsv->avsync * st[NSV_ST_VIDEO]->time_base.den; + PRINT(("NSV AUDIO: sync:%d, dts:%"PRId64, nsv->avsync, pkt->dts)); + } + nst->frame_offset++; } - //pkt->flags |= PKT_FLAG_KEY; nsv->state = NSV_UNSYNC; return 0; }

1 0

r6825 - trunk/libavformat/udp.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: gpoirier Date: Sat Oct 28 19:16:18 2006 New Revision: 6825 Modified: trunk/libavformat/udp.c Log: Make it possible to reuse UDP socket (optional, disabled by default) Patch by Thijs % thijsvermeir A telenet P be % Original thread: Subject: Re: [Ffmpeg-devel] [PATCH proposal] Reuse UDP socket v2 Date: October 28, 2006 11:09:00 AM CEDT Modified: trunk/libavformat/udp.c ============================================================================== --- trunk/libavformat/udp.c (original) +++ trunk/libavformat/udp.c Sat Oct 28 19:16:18 2006 @@ -40,6 +40,7 @@ int ttl; int is_multicast; int local_port; + int reuse_socket; #ifndef CONFIG_IPV6 struct ip_mreq mreq; struct sockaddr_in dest_addr; @@ -236,6 +237,7 @@ * 'ttl=n' : set the ttl value (for multicast only) * 'localport=n' : set the local port * 'pkt_size=n' : set max packet size + * 'reuse=1' : enable reusing the socket * * @param s1 media file context * @param uri of the remote server @@ -311,9 +313,11 @@ s->ttl = 16; s->is_multicast = 0; s->local_port = 0; + s->reuse_socket = 0; p = strchr(uri, '?'); if (p) { s->is_multicast = find_info_tag(buf, sizeof(buf), "multicast", p); + s->reuse_socket = find_info_tag(buf, sizeof(buf), "reuse", p); if (find_info_tag(buf, sizeof(buf), "ttl", p)) { s->ttl = strtol(buf, NULL, 10); } @@ -351,6 +355,10 @@ my_addr.sin_port = htons(s->local_port); } + if (s->reuse_socket) + if (setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket)) != 0) + goto fail; + /* the bind is needed to give a port to the socket now */ if (bind(udp_fd,(struct sockaddr *)&my_addr, sizeof(my_addr)) < 0) goto fail;

1 0

r6824 - trunk/libavcodec/mpegvideo.h
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 18:11:25 2006 New Revision: 6824 Modified: trunk/libavcodec/mpegvideo.h Log: lambda* should be unsigned Modified: trunk/libavcodec/mpegvideo.h ============================================================================== --- trunk/libavcodec/mpegvideo.h (original) +++ trunk/libavcodec/mpegvideo.h Sat Oct 28 18:11:25 2006 @@ -321,8 +321,8 @@ int qscale; ///< QP int chroma_qscale; ///< chroma QP - int lambda; ///< lagrange multipler used in rate distortion - int lambda2; ///< (lambda*lambda) >> FF_LAMBDA_SHIFT + unsigned int lambda; ///< lagrange multipler used in rate distortion + unsigned int lambda2; ///< (lambda*lambda) >> FF_LAMBDA_SHIFT int *lambda_table; int adaptive_quant; ///< use adaptive quantization int dquant; ///< qscale difference to prev qscale

1 0

r6813 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 00:16:25 2006 New Revision: 6813 Modified: trunk/libavcodec/eval.c Log: support seperating expressons by ; support variables, the syntax isnt beautifull (st(a,b) means var[a]=b and ld(a) var[a]) but for a mere 19 lines of code its fairly simple, if anyone wants to write real variables support with names for variables and = and [] then that would of course be welcome but only if it doesnt bloat the code up terribly...) Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 00:16:25 2006 @@ -56,6 +56,8 @@ char **func2_name; // NULL terminated void *opaque; char **error; +#define VARS 10 + double var[VARS]; } Parser; static int8_t si_prefixes['z' - 'E' + 1]={ @@ -128,9 +130,10 @@ struct ff_expr_s { enum { e_value, e_const, e_func0, e_func1, e_func2, - e_squish, e_gauss, + e_squish, e_gauss, e_ld, e_mod, e_max, e_min, e_eq, e_gt, e_gte, e_pow, e_mul, e_div, e_add, + e_last, e_st, } type; double value; // is sign in other types union { @@ -151,6 +154,7 @@ case e_func2: return e->value * e->a.func2(p->opaque, eval_expr(p, e->param[0]), eval_expr(p, e->param[1])); case e_squish: return 1/(1+exp(4*eval_expr(p, e->param[0]))); case e_gauss: { double d = eval_expr(p, e->param[0]); return exp(-d*d/2)/sqrt(2*M_PI); } + case e_ld: return e->value * p->var[clip(eval_expr(p, e->param[0]), 0, VARS-1)]; default: { double d = eval_expr(p, e->param[0]); double d2 = eval_expr(p, e->param[1]); @@ -165,6 +169,8 @@ case e_mul: return e->value * (d * d2); case e_div: return e->value * (d / d2); case e_add: return e->value * (d + d2); + case e_last:return d2; + case e_st : return e->value * (p->var[clip(d, 0, VARS-1)]= d2); } } } @@ -258,6 +264,8 @@ else if( strmatch(next, "gt" ) ) d->type = e_gt; else if( strmatch(next, "lte" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; } else if( strmatch(next, "lt" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; } + else if( strmatch(next, "ld" ) ) d->type = e_ld; + else if( strmatch(next, "st" ) ) d->type = e_st; else { for(i=0; p->func1_name && p->func1_name[i]; i++){ if(strmatch(next, p->func1_name[i])){ @@ -319,6 +327,15 @@ return e; } +static AVEvalExpr * parse_subexpr(Parser *p) { + AVEvalExpr * e = parse_term(p); + while(*p->s == '+' || *p->s == '-') { + e= new_eval_expr(e_add, 1, e, parse_term(p)); + }; + + return e; +} + static AVEvalExpr * parse_expr(Parser *p) { AVEvalExpr * e; @@ -326,10 +343,11 @@ return NULL; p->stack_index--; - e = parse_term(p); + e = parse_subexpr(p); - while(*p->s == '+' || *p->s == '-') { - e= new_eval_expr(e_add, 1, e, parse_term(p)); + while(*p->s == ';') { + p->s++; + e= new_eval_expr(e_last, 1, e, parse_subexpr(p)); }; p->stack_index++; @@ -345,6 +363,7 @@ case e_func0: case e_func1: case e_squish: + case e_ld: case e_gauss: return verify_expr(e->param[0]); default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); }

4 6

r6823 - trunk/libavcodec/mpegvideo.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 17:20:00 2006 New Revision: 6823 Modified: trunk/libavcodec/mpegvideo.c Log: prevent overflow if lambda2 is "too" large Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Sat Oct 28 17:20:00 2006 @@ -5579,7 +5579,7 @@ /* Estimate motion for every MB */ if(s->pict_type != I_TYPE){ s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8; - s->lambda2= (s->lambda2* s->avctx->me_penalty_compensation + 128)>>8; + s->lambda2= (s->lambda2* (int64_t)s->avctx->me_penalty_compensation + 128)>>8; if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);

1 0

r6822 - trunk/libavcodec/mpegvideo.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: michael Date: Sat Oct 28 13:15:06 2006 New Revision: 6822 Modified: trunk/libavcodec/mpegvideo.c Log: use lambda/lmax instead of qscale/qmax as end check for vbv retry Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Sat Oct 28 13:15:06 2006 @@ -2535,7 +2535,7 @@ RateControlContext *rcc= &s->rc_context; int max_size= rcc->buffer_index/3; - if(put_bits_count(&s->pb) > max_size && s->qscale < s->avctx->qmax){ + if(put_bits_count(&s->pb) > max_size && s->lambda < s->avctx->lmax){ s->next_lambda= FFMAX(s->lambda+1, s->lambda*(s->qscale+1) / s->qscale); s->mb_skipped = 0; //done in MPV_frame_start() if(s->pict_type==P_TYPE){ //done in encode_picture() so we must undo it

1 0

[propchange]: r6821 - svn:log
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: ods15 Revision: 6821 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -ignore whitespace in ff_evaL +ignore whitespace in ff_eval

1 0

r6821 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: ods15 Date: Sat Oct 28 11:49:13 2006 New Revision: 6821 Modified: trunk/libavcodec/eval.c Log: ignore whitespace in ff_evaL Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 11:49:13 2006 @@ -382,9 +382,14 @@ char **error){ Parser p; AVEvalExpr * e; + char w[strlen(s) + 1], * wp = w; + + while (*s) + if (!isspace(*s++)) *wp++ = s[-1]; + *wp++ = 0; p.stack_index=100; - p.s= s; + p.s= w; p.const_name = const_name; p.func1 = func1; p.func1_name = func1_name;

1 0

r6820 - trunk/libavcodec/amr.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: diego Date: Sat Oct 28 11:30:43 2006 New Revision: 6820 Modified: trunk/libavcodec/amr.c Log: sample rate fix patch by Andrew Voznytsa andrew.voznytsa gmail com Modified: trunk/libavcodec/amr.c ============================================================================== --- trunk/libavcodec/amr.c (original) +++ trunk/libavcodec/amr.c Sat Oct 28 11:30:43 2006 @@ -109,6 +109,23 @@ return(MR122); } +static void amr_decode_fix_avctx(AVCodecContext * avctx) +{ + const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB); + + if(avctx->sample_rate == 0) + { + avctx->sample_rate = 8000 * is_amr_wb; + } + + if(avctx->channels == 0) + { + avctx->channels = 1; + } + + avctx->frame_size = 160 * is_amr_wb; +} + #ifdef CONFIG_AMR_NB_FIXED /* fixed point version*/ /* frame size in serial bitstream file (frame type + serial stream + flags) */ @@ -145,6 +162,15 @@ av_log(avctx, AV_LOG_ERROR, "Speech_Decode_Frame_init error\n"); return -1; } + + amr_decode_fix_avctx(avctx); + + if(avctx->channels > 1) + { + av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n"); + return -1; + } + return 0; } @@ -347,6 +373,15 @@ av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n"); return -1; } + + amr_decode_fix_avctx(avctx); + + if(avctx->channels > 1) + { + av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n"); + return -1; + } + return 0; } @@ -598,6 +633,15 @@ AMRWBContext *s = (AMRWBContext *)avctx->priv_data; s->frameCount=0; s->state = D_IF_init(); + + amr_decode_fix_avctx(avctx); + + if(avctx->channels > 1) + { + av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n"); + return -1; + } + return 0; }

1 0

r6819 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: ods15 Date: Sat Oct 28 10:03:30 2006 New Revision: 6819 Modified: trunk/libavcodec/eval.c Log: add missing 'e->value * ' Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 10:03:30 2006 @@ -175,7 +175,7 @@ case e_mul: return e->value * (d * d2); case e_div: return e->value * (d / d2); case e_add: return e->value * (d + d2); - case e_last:return d2; + case e_last:return e->value * d2; case e_st : return e->value * (p->var[clip(d, 0, VARS-1)]= d2); } }

1 0

r6818 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: ods15 Date: Sat Oct 28 09:03:24 2006 New Revision: 6818 Modified: trunk/libavcodec/eval.c Log: shut gcc warning, also makes sense for NAN to be returned if the loop was never executed Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 09:03:24 2006 @@ -156,7 +156,7 @@ case e_gauss: { double d = eval_expr(p, e->param[0]); return exp(-d*d/2)/sqrt(2*M_PI); } case e_ld: return e->value * p->var[clip(eval_expr(p, e->param[0]), 0, VARS-1)]; case e_while: { - double d; + double d = NAN; while(eval_expr(p, e->param[0])) d=eval_expr(p, e->param[1]); return d;

1 0

r6817 - in trunk/libavformat: Makefile rtp.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: gpoirier Date: Sat Oct 28 02:29:59 2006 New Revision: 6817 Modified: trunk/libavformat/Makefile trunk/libavformat/rtp.c Log: move up (in the file) AAC audio handling moved from below This is because upper section handles packets, and the lower switch handles timestamps Patch by Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Oct 27, 2006 11:40 PM Subject: Re: [Ffmpeg-devel] RTP patches & RFC Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile (original) +++ trunk/libavformat/Makefile Sat Oct 28 02:29:59 2006 @@ -174,7 +174,7 @@ ifeq ($(CONFIG_PROTOCOLS),yes) OBJS+= file.o ifeq ($(CONFIG_NETWORK),yes) -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o +OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o # BeOS and Darwin network stuff ifeq ($(NEED_INET_ATON),yes) OBJS+= barpainet.o Modified: trunk/libavformat/rtp.c ============================================================================== --- trunk/libavformat/rtp.c (original) +++ trunk/libavformat/rtp.c Sat Oct 28 02:29:59 2006 @@ -526,6 +526,31 @@ av_new_packet(pkt, len); memcpy(pkt->data, buf, len); break; + // moved from below, verbatim. this is because this section handles packets, and the lower switch handles + // timestamps. + // TODO: Put this into a dynamic packet handler... + case CODEC_ID_MPEG4AAC: + if (rtp_parse_mp4_au(s, buf)) + return -1; + { + rtp_payload_data_t *infos = s->rtp_payload_data; + if (infos == NULL) + return -1; + buf += infos->au_headers_length_bytes + 2; + len -= infos->au_headers_length_bytes + 2; + + /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define + one au_header */ + av_new_packet(pkt, infos->au_headers[0].size); + memcpy(pkt->data, buf, infos->au_headers[0].size); + buf += infos->au_headers[0].size; + len -= infos->au_headers[0].size; + } + s->read_buf_size = len; + s->buf_ptr = buf; + pkt->stream_index = s->st->index; + return 0; ///< Temporary return. + break; default: if(s->parse_packet) { return s->parse_packet(s, pkt, timestamp, buf, len); @@ -550,30 +575,11 @@ pkt->pts = addend + delta_timestamp; } break; + case CODEC_ID_MPEG4AAC: + case CODEC_ID_H264: case CODEC_ID_MPEG4: pkt->pts = timestamp; break; - case CODEC_ID_MPEG4AAC: - if (rtp_parse_mp4_au(s, buf)) - return -1; - { - rtp_payload_data_t *infos = s->rtp_payload_data; - if (infos == NULL) - return -1; - buf += infos->au_headers_length_bytes + 2; - len -= infos->au_headers_length_bytes + 2; - - /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define - one au_header */ - av_new_packet(pkt, infos->au_headers[0].size); - memcpy(pkt->data, buf, infos->au_headers[0].size); - buf += infos->au_headers[0].size; - len -= infos->au_headers[0].size; - } - s->read_buf_size = len; - s->buf_ptr = buf; - pkt->stream_index = s->st->index; - return 0; default: /* no timestamp info yet */ break;

1 0

r6815 - in trunk/libavcodec: Makefile dvdsub.c dvdsubdec.c
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: diego Date: Sat Oct 28 01:37:35 2006 New Revision: 6815 Added: trunk/libavcodec/dvdsubdec.c - copied unchanged from r6789, /trunk/libavcodec/dvdsub.c Removed: trunk/libavcodec/dvdsub.c Modified: trunk/libavcodec/Makefile Log: Rename dvdsub.c to dvdsubdec.c. Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Sat Oct 28 01:37:35 2006 @@ -66,7 +66,7 @@ OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.o OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o -OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsub.o +OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o @@ -294,7 +294,7 @@ OBJS-$(CONFIG_AC3_PARSER) += parser.o OBJS-$(CONFIG_CAVS_PARSER) += parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.o -OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub.o +OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.o OBJS-$(CONFIG_H261_PARSER) += h261.o OBJS-$(CONFIG_H263_PARSER) += h263dec.o OBJS-$(CONFIG_H264_PARSER) += h264.o

3 2

r6816 - in trunk/libavformat: base64.c base64.h
by subversion＠mplayerhq.hu 28 Oct '06

28 Oct '06

Author: gpoirier Date: Sat Oct 28 02:12:31 2006 New Revision: 6816 Added: trunk/libavformat/base64.c trunk/libavformat/base64.h Log: Add base64 encoding and decoding routines Patch Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Oct 27, 2006 6:49 PM Subject: [Ffmpeg-devel] [PATCH] Base64 code Added: trunk/libavformat/base64.c ============================================================================== --- (empty file) +++ trunk/libavformat/base64.c Sat Oct 28 02:12:31 2006 @@ -0,0 +1,231 @@ +/* + * Base64.c + * Copyright (c) 2006 Ryan Martell. (rdm4 at martellventures.com) + * + * 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 + */ + +/** +* @file base64.c + * @brief Base64 Encode/Decode + * @author Ryan Martell <rdm4 at martellventures.com> (with lots of Michael) + */ + +#include "common.h" +#include "base64.h" + +/* ---------------- private code */ +static uint8_t map2[] = +{ + 0x3e, 0xff, 0xff, 0xff, 0x3f, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x1b, + 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, + 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33 +}; + +int av_base64_decode(uint8_t * out, const char *in, int out_length) +{ + int i, v; + uint8_t *dst = out; + + v = 0; + for (i = 0; in[i] && in[i] != '='; i++) { + unsigned int index= in[i]-43; + if (index>=(sizeof(map2)/sizeof(map2[0])) || map2[index] == 0xff) + return -1; + v = (v << 6) + map2[index]; + if (i & 3) { + if (dst - out < out_length) { + *dst++ = v >> (6 - 2 * (i & 3)); + } + } + } + + return (dst - out); +} + +/***************************************************************************** +* b64_encode: stolen from VLC's http.c +* simplified by michael +* fixed edge cases and made it work from data (vs. strings) by ryan. +*****************************************************************************/ + +char *av_base64_encode(uint8_t * src, int len) +{ + static const char b64[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + char *ret, *dst; + unsigned i_bits = 0; + int i_shift = 0; + int bytes_remaining = len; + + if (len < UINT_MAX / 4) { + ret = dst = av_malloc(len * 4 / 3 + 12); + } else + return NULL; + + if (len) { // special edge case, what should we really do here? + while (bytes_remaining) { + i_bits = (i_bits << 8) + *src++; + bytes_remaining--; + i_shift += 8; + + do { + *dst++ = b64[(i_bits << 6 >> i_shift) & 0x3f]; + i_shift -= 6; + } while (i_shift > 6 || (bytes_remaining == 0 && i_shift > 0)); + } + while ((dst - ret) & 3) + *dst++ = '='; + } + *dst = '\0'; + + return ret; +} + +// #define TEST_BASE64 + +#ifdef TEST_BASE64 +#include "avutil.h" + +int b64test() +{ + int numerr = 0; + int len; + int numtest = 1; + uint8_t decode[1000]; + struct test { + void *data; + int len; + const char *result; + } *t, tests[] = { + { + "", 0, ""}, { + "1", 1, "MQ=="}, { + "22", 2, "MjI="}, { + "333", 3, "MzMz"}, { + "4444", 4, "NDQ0NA=="}, { + "55555", 5, "NTU1NTU="}, { + "abc:def", 7, "YWJjOmRlZg=="}, { + NULL} + }; + for (t = tests; t->data; t++) { + char *str; + + av_log(NULL, AV_LOG_ERROR, "Encoding %s...\n", (char *) t->data); + str = av_base64_encode(t->data, t->len); + if (str) { + av_log(NULL, AV_LOG_ERROR, "Encoded to %s...\n", str); + if (strcmp(str, t->result) != 0) { + av_log(NULL, AV_LOG_ERROR, "failed test %d: %s != %s\n", + numtest, str, t->result); + numerr++; + } + av_free(str); + } + + av_log(NULL, AV_LOG_ERROR, "Done encoding, about to decode...\n"); + len = av_base64_decode(decode, t->result, sizeof(decode)); + if (len != t->len) { + av_log(NULL, AV_LOG_ERROR, "failed test %d: len %d != %d\n", + numtest, len, t->len); + numerr++; + } else if (memcmp(decode, t->data, t->len) != 0) { + av_log(NULL, AV_LOG_ERROR, "failed test %d: data\n", numtest); + numerr++; + } else { + av_log(NULL, AV_LOG_ERROR, "Decoded to %s\n", + (char *) t->data); + } + numtest++; + } + +#undef srand +#undef rand + + { + int test_count; + srand(123141); // time(NULL)); + for (test_count = 0; test_count < 100; test_count++) { + int size = rand() % 1024; + int ii; + uint8_t *data; + char *encoded_result; + + av_log(NULL, AV_LOG_ERROR, "Test %d: Size %d bytes...", + test_count, size); + data = (uint8_t *) av_malloc(size); + for (ii = 0; ii < size; ii++) { + data[ii] = rand() % 255; + } + + encoded_result = av_base64_encode(data, size); + if (encoded_result) { + int decode_buffer_size = size + 10; // try without 10 as well + uint8_t *decode_buffer = av_malloc(decode_buffer_size); + if (decode_buffer) { + int decoded_size = + av_base64_decode(decode_buffer, encoded_result, + decode_buffer_size); + + if (decoded_size != size) { + av_log(NULL, AV_LOG_ERROR, + "Decoded/Encoded size mismatch (%d != %d)\n", + decoded_size, size); + } else { + if (memcmp(decode_buffer, data, decoded_size) == 0) { + av_log(NULL, AV_LOG_ERROR, "Passed!\n"); + } else { + av_log(NULL, AV_LOG_ERROR, + "Failed (Data differs)!\n"); + } + } + av_free(decode_buffer); + } + + av_free(encoded_result); + } + } + } + + // these are invalid strings, that it currently decodes (which it probably shouldn't?) + { + uint8_t str[32]; + if (av_base64_decode(str, "M=M=", sizeof(str)) != -1) { + av_log(NULL, AV_LOG_ERROR, + "failed test %d: successful decode of `M=M='\n", + numtest++); + numerr++; + } + if (av_base64_decode(str, "MQ===", sizeof(str)) != -1) { + av_log(NULL, AV_LOG_ERROR, + "failed test %d: successful decode of `MQ==='\n", + numtest++); + numerr++; + } + } + + return numerr; +} +#endif + Added: trunk/libavformat/base64.h ============================================================================== --- (empty file) +++ trunk/libavformat/base64.h Sat Oct 28 02:12:31 2006 @@ -0,0 +1,24 @@ +/* + * Base64.c + * Copyright (c) 2006 Ryan Martell. (rdm4 at martellventures.com) + * + * 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 + */ + +int av_base64_decode(uint8_t * out, const char *in, int out_length); // param order as strncpy() +char *av_base64_encode(uint8_t * src, int len); // src is not a string, it's data. +

1 0

r6814 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: michael Date: Sat Oct 28 00:35:55 2006 New Revision: 6814 Modified: trunk/libavcodec/eval.c Log: add support for while() loops again ugly syntax while(condition, statements) but very simple implementation Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Sat Oct 28 00:35:55 2006 @@ -133,7 +133,7 @@ e_squish, e_gauss, e_ld, e_mod, e_max, e_min, e_eq, e_gt, e_gte, e_pow, e_mul, e_div, e_add, - e_last, e_st, + e_last, e_st, e_while, } type; double value; // is sign in other types union { @@ -155,6 +155,12 @@ case e_squish: return 1/(1+exp(4*eval_expr(p, e->param[0]))); case e_gauss: { double d = eval_expr(p, e->param[0]); return exp(-d*d/2)/sqrt(2*M_PI); } case e_ld: return e->value * p->var[clip(eval_expr(p, e->param[0]), 0, VARS-1)]; + case e_while: { + double d; + while(eval_expr(p, e->param[0])) + d=eval_expr(p, e->param[1]); + return d; + } default: { double d = eval_expr(p, e->param[0]); double d2 = eval_expr(p, e->param[1]); @@ -266,6 +272,7 @@ else if( strmatch(next, "lt" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; } else if( strmatch(next, "ld" ) ) d->type = e_ld; else if( strmatch(next, "st" ) ) d->type = e_st; + else if( strmatch(next, "while" ) ) d->type = e_while; else { for(i=0; p->func1_name && p->func1_name[i]; i++){ if(strmatch(next, p->func1_name[i])){

3 2

r6812 - trunk/libavcodec/imgconvert.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: reynaldo Date: Sat Oct 28 00:08:02 2006 New Revision: 6812 Modified: trunk/libavcodec/imgconvert.c Log: Fix obvious typo, BGR555 was missing Modified: trunk/libavcodec/imgconvert.c ============================================================================== --- trunk/libavcodec/imgconvert.c (original) +++ trunk/libavcodec/imgconvert.c Sat Oct 28 00:08:02 2006 @@ -522,7 +522,7 @@ if (pix_fmt == PIX_FMT_YUV422 || pix_fmt == PIX_FMT_UYVY422 || pix_fmt == PIX_FMT_BGR565 || - pix_fmt == PIX_FMT_BGR565 || + pix_fmt == PIX_FMT_BGR555 || pix_fmt == PIX_FMT_RGB565 || pix_fmt == PIX_FMT_RGB555) w = width * 2;

1 0

r6811 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: ods15 Date: Fri Oct 27 23:37:47 2006 New Revision: 6811 Modified: trunk/libavcodec/eval.c Log: possible bug of 'gte' being read as 'gt', same with 'lte' Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Fri Oct 27 23:37:47 2006 @@ -254,10 +254,10 @@ else if( strmatch(next, "max" ) ) d->type = e_max; else if( strmatch(next, "min" ) ) d->type = e_min; else if( strmatch(next, "eq" ) ) d->type = e_eq; - else if( strmatch(next, "gt" ) ) d->type = e_gt; else if( strmatch(next, "gte" ) ) d->type = e_gte; - else if( strmatch(next, "lt" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; } + else if( strmatch(next, "gt" ) ) d->type = e_gt; else if( strmatch(next, "lte" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; } + else if( strmatch(next, "lt" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; } else { for(i=0; p->func1_name && p->func1_name[i]; i++){ if(strmatch(next, p->func1_name[i])){

1 0

r6810 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: michael Date: Fri Oct 27 23:13:31 2006 New Revision: 6810 Modified: trunk/libavcodec/eval.c Log: minor simplification Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Fri Oct 27 23:13:31 2006 @@ -302,12 +302,9 @@ int sign, sign2; AVEvalExpr * e = parse_pow(p, &sign); while(p->s[0]=='^'){ - AVEvalExpr * tmp; - p->s++; - tmp= new_eval_expr(e_pow, 1, e, parse_pow(p, &sign2)); - if (tmp->param[1]) tmp->param[1]->value *= (sign2|1); - e = tmp; + e= new_eval_expr(e_pow, 1, e, parse_pow(p, &sign2)); + if (e->param[1]) e->param[1]->value *= (sign2|1); } if (e) e->value *= (sign|1); return e;

1 0

r6809 - trunk/libavcodec/eval.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: michael Date: Fri Oct 27 22:38:10 2006 New Revision: 6809 Modified: trunk/libavcodec/eval.c Log: factorize AVEvalExpr alloc and init Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Fri Oct 27 22:38:10 2006 @@ -283,6 +283,15 @@ return d; } +static AVEvalExpr * new_eval_expr(int type, int value, AVEvalExpr *p0, AVEvalExpr *p1){ + AVEvalExpr * e = av_mallocz(sizeof(AVEvalExpr)); + e->type =type ; + e->value =value ; + e->param[0] =p0 ; + e->param[1] =p1 ; + return e; +} + static AVEvalExpr * parse_pow(Parser *p, int *sign){ *sign= (*p->s == '+') - (*p->s == '-'); p->s += *sign&1; @@ -293,14 +302,10 @@ int sign, sign2; AVEvalExpr * e = parse_pow(p, &sign); while(p->s[0]=='^'){ - AVEvalExpr * tmp = av_mallocz(sizeof(AVEvalExpr)); + AVEvalExpr * tmp; p->s++; - - tmp->type = e_pow; - tmp->value = 1.; - tmp->param[0] = e; - tmp->param[1] = parse_pow(p, &sign2); + tmp= new_eval_expr(e_pow, 1, e, parse_pow(p, &sign2)); if (tmp->param[1]) tmp->param[1]->value *= (sign2|1); e = tmp; } @@ -311,13 +316,8 @@ static AVEvalExpr * parse_term(Parser *p){ AVEvalExpr * e = parse_factor(p); while(p->s[0]=='*' || p->s[0]=='/'){ - AVEvalExpr * tmp = av_mallocz(sizeof(AVEvalExpr)); - if(*p->s++ == '*') tmp->type = e_mul; - else tmp->type = e_div; - tmp->value = 1.; - tmp->param[0] = e; - tmp->param[1] = parse_factor(p); - e = tmp; + int c= *p->s++; + e= new_eval_expr(c == '*' ? e_mul : e_div, 1, e, parse_factor(p)); } return e; } @@ -332,12 +332,7 @@ e = parse_term(p); while(*p->s == '+' || *p->s == '-') { - AVEvalExpr * tmp = av_mallocz(sizeof(AVEvalExpr)); - tmp->type = e_add; - tmp->value = 1.; - tmp->param[0] = e; - tmp->param[1] = parse_term(p); - e = tmp; + e= new_eval_expr(e_add, 1, e, parse_term(p)); }; p->stack_index++;

1 0

r6808 - in trunk/libavcodec: ratecontrol.c ratecontrol.h
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: ods15 Date: Fri Oct 27 22:16:26 2006 New Revision: 6808 Modified: trunk/libavcodec/ratecontrol.c trunk/libavcodec/ratecontrol.h Log: update ratecontrol to new ff_eval API Modified: trunk/libavcodec/ratecontrol.c ============================================================================== --- trunk/libavcodec/ratecontrol.c (original) +++ trunk/libavcodec/ratecontrol.c Fri Oct 27 22:16:26 2006 @@ -48,12 +48,70 @@ s->f_code, s->b_code, s->current_picture.mc_mb_var_sum, s->current_picture.mb_var_sum, s->i_count, s->skip_count, s->header_bits); } +static inline double qp2bits(RateControlEntry *rce, double qp){ + if(qp<=0.0){ + av_log(NULL, AV_LOG_ERROR, "qp<=0.0\n"); + } + return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ qp; +} + +static inline double bits2qp(RateControlEntry *rce, double bits){ + if(bits<0.9){ + av_log(NULL, AV_LOG_ERROR, "bits<0.9\n"); + } + return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ bits; +} + int ff_rate_control_init(MpegEncContext *s) { RateControlContext *rcc= &s->rc_context; int i; + char *error = NULL; + static const char *const_names[]={ + "PI", + "E", + "iTex", + "pTex", + "tex", + "mv", + "fCode", + "iCount", + "mcVar", + "var", + "isI", + "isP", + "isB", + "avgQP", + "qComp", +/* "lastIQP", + "lastPQP", + "lastBQP", + "nextNonBQP",*/ + "avgIITex", + "avgPITex", + "avgPPTex", + "avgBPTex", + "avgTex", + NULL + }; + static double (*func1[])(void *, double)={ + (void *)bits2qp, + (void *)qp2bits, + NULL + }; + static const char *func1_names[]={ + "bits2qp", + "qp2bits", + NULL + }; emms_c(); + rcc->rc_eq_eval = ff_parse(s->avctx->rc_eq, const_names, func1, func1_names, NULL, NULL, &error); + if (!rcc->rc_eq_eval) { + av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\": %s\n", s->avctx->rc_eq, error? error : ""); + return -1; + } + for(i=0; i<5; i++){ rcc->pred[i].coeff= FF_QP2LAMBDA * 7.0; rcc->pred[i].count= 1.0; @@ -195,6 +253,7 @@ RateControlContext *rcc= &s->rc_context; emms_c(); + ff_eval_free(rcc->rc_eq_eval); av_freep(&rcc->entry); #ifdef CONFIG_XVID @@ -203,20 +262,6 @@ #endif } -static inline double qp2bits(RateControlEntry *rce, double qp){ - if(qp<=0.0){ - av_log(NULL, AV_LOG_ERROR, "qp<=0.0\n"); - } - return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ qp; -} - -static inline double bits2qp(RateControlEntry *rce, double bits){ - if(bits<0.9){ - av_log(NULL, AV_LOG_ERROR, "bits<0.9\n"); - } - return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ bits; -} - int ff_vbv_update(MpegEncContext *s, int frame_size){ RateControlContext *rcc= &s->rc_context; const double fps= 1/av_q2d(s->avctx->time_base); @@ -263,7 +308,6 @@ const int pict_type= rce->new_pict_type; const double mb_num= s->mb_num; int i; - char *error = NULL; double const_values[]={ M_PI, @@ -292,47 +336,10 @@ (rcc->i_cplx_sum[pict_type] + rcc->p_cplx_sum[pict_type]) / (double)rcc->frame_count[pict_type], 0 }; - static const char *const_names[]={ - "PI", - "E", - "iTex", - "pTex", - "tex", - "mv", - "fCode", - "iCount", - "mcVar", - "var", - "isI", - "isP", - "isB", - "avgQP", - "qComp", -/* "lastIQP", - "lastPQP", - "lastBQP", - "nextNonBQP",*/ - "avgIITex", - "avgPITex", - "avgPPTex", - "avgBPTex", - "avgTex", - NULL - }; - static double (*func1[])(void *, double)={ - (void *)bits2qp, - (void *)qp2bits, - NULL - }; - static const char *func1_names[]={ - "bits2qp", - "qp2bits", - NULL - }; - bits= ff_eval2(s->avctx->rc_eq, const_values, const_names, func1, func1_names, NULL, NULL, rce, &error); + bits= ff_parse_eval(rcc->rc_eq_eval, const_values, rce); if (isnan(bits)) { - av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\": %s\n", s->avctx->rc_eq, error? error : ""); + av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n", s->avctx->rc_eq); return -1; } Modified: trunk/libavcodec/ratecontrol.h ============================================================================== --- trunk/libavcodec/ratecontrol.h (original) +++ trunk/libavcodec/ratecontrol.h Fri Oct 27 22:16:26 2006 @@ -28,6 +28,8 @@ * ratecontrol header. */ +#include "eval.h" + typedef struct Predictor{ double coeff; double count; @@ -80,6 +82,7 @@ void *non_lavc_opaque; ///< context for non lavc rc code (for example xvid) float dry_run_qscale; ///< for xvid rc int last_picture_number; ///< for xvid rc + AVEvalExpr * rc_eq_eval; }RateControlContext; struct MpegEncContext;

1 0