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

r6807 - trunk/libavcodec/raw.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: reynaldo Date: Fri Oct 27 21:53:41 2006 New Revision: 6807 Modified: trunk/libavcodec/raw.c Log: adds missing rgb/bgr 565 codec->fmt mappings, ok'ed by Michael Modified: trunk/libavcodec/raw.c ============================================================================== --- trunk/libavcodec/raw.c (original) +++ trunk/libavcodec/raw.c Fri Oct 27 21:53:41 2006 @@ -54,6 +54,8 @@ { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) }, + { PIX_FMT_RGB565, MKTAG('R', 'G', 'B', 16) }, + { PIX_FMT_BGR565, MKTAG('B', 'G', 'R', 16) }, /* quicktime */ { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },

1 0

r6806 - trunk/libavcodec/raw.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: reynaldo Date: Fri Oct 27 21:50:31 2006 New Revision: 6806 Modified: trunk/libavcodec/raw.c Log: adds missing rgb/bgr 555 codec->fmt mappings, ok'ed by Michael Modified: trunk/libavcodec/raw.c ============================================================================== --- trunk/libavcodec/raw.c (original) +++ trunk/libavcodec/raw.c Fri Oct 27 21:50:31 2006 @@ -52,6 +52,8 @@ { PIX_FMT_YUV422, MKTAG('Y', '4', '2', '2') }, { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, + { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, + { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) }, /* quicktime */ { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },

1 0

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

27 Oct '06

Author: gpoirier Date: Fri Oct 27 20:19:29 2006 New Revision: 6805 Modified: trunk/libavformat/rtp.c trunk/libavformat/rtp.h trunk/libavformat/rtp_internal.h trunk/libavformat/rtsp.c Log: make ffmpeg able to send back a RTCP receiver report. Patch by Thijs thijsvermeir A telenet P be Original thread: Date: Oct 27, 2006 12:58 PM Subject: [Ffmpeg-devel] [PATCH proposal] RTCP receiver report Modified: trunk/libavformat/rtp.c ============================================================================== --- trunk/libavformat/rtp.c (original) +++ trunk/libavformat/rtp.c Fri Oct 27 20:19:29 2006 @@ -259,12 +259,77 @@ } /** + * some rtp servers assume client is dead if they don't hear from them... + * so we send a Receiver Report to the provided ByteIO context + * (we don't have access to the rtcp handle from here) + */ +int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) +{ + ByteIOContext pb; + uint8_t *buf; + int len; + int rtcp_bytes; + + if (!s->rtp_ctx || (count < 1)) + return -1; + + /* XXX: mpeg pts hardcoded. RTCP send every 0.5 seconds */ + s->octet_count += count; + rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) / + RTCP_TX_RATIO_DEN; + rtcp_bytes /= 50; // mmu_man: that's enough for me... VLC sends much less btw !? + if (rtcp_bytes < 28) + return -1; + s->last_octet_count = s->octet_count; + + if (url_open_dyn_buf(&pb) < 0) + return -1; + + // Receiver Report + put_byte(&pb, (RTP_VERSION << 6) + 1); /* 1 report block */ + put_byte(&pb, 201); + put_be16(&pb, 7); /* length in words - 1 */ + put_be32(&pb, s->ssrc); // our own SSRC + put_be32(&pb, s->ssrc); // XXX: should be the server's here! + // some placeholders we should really fill... + put_be32(&pb, ((0 << 24) | (0 & 0x0ffffff))); /* 0% lost, total 0 lost */ + put_be32(&pb, (0 << 16) | s->seq); + put_be32(&pb, 0x68); /* jitter */ + put_be32(&pb, -1); /* last SR timestamp */ + put_be32(&pb, 1); /* delay since last SR */ + + // CNAME + put_byte(&pb, (RTP_VERSION << 6) + 1); /* 1 report block */ + put_byte(&pb, 202); + len = strlen(s->hostname); + put_be16(&pb, (6 + len + 3) / 4); /* length in words - 1 */ + put_be32(&pb, s->ssrc); + put_byte(&pb, 0x01); + put_byte(&pb, len); + put_buffer(&pb, s->hostname, len); + // padding + for (len = (6 + len) % 4; len % 4; len++) { + put_byte(&pb, 0); + } + + put_flush_packet(&pb); + len = url_close_dyn_buf(&pb, &buf); + if ((len > 0) && buf) { +#if defined(DEBUG) + printf("sending %d bytes of RR\n", len); +#endif + url_write(s->rtp_ctx, buf, len); + av_free(buf); + } + return 0; +} + +/** * 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, int payload_type, rtp_payload_data_t *rtp_payload_data) +RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, rtp_payload_data_t *rtp_payload_data) { RTPDemuxContext *s; @@ -299,6 +364,9 @@ break; } } + // needed to send back RTCP RR in RTSP sessions + s->rtp_ctx = rtpc; + gethostname(s->hostname, sizeof(s->hostname)); return s; } @@ -399,6 +467,8 @@ seq = (buf[2] << 8) | buf[3]; timestamp = decode_be32(buf + 4); ssrc = decode_be32(buf + 8); + /* store the ssrc in the RTPDemuxContext */ + s->ssrc = ssrc; /* NOTE: we can handle only one payload type */ if (s->payload_type != payload_type) Modified: trunk/libavformat/rtp.h ============================================================================== --- trunk/libavformat/rtp.h (original) +++ trunk/libavformat/rtp.h Fri Oct 27 20:19:29 2006 @@ -30,7 +30,7 @@ typedef struct RTPDemuxContext RTPDemuxContext; typedef struct rtp_payload_data_s rtp_payload_data_s; -RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, int payload_type, rtp_payload_data_s *rtp_payload_data); +RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, rtp_payload_data_s *rtp_payload_data); int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, const uint8_t *buf, int len); void rtp_parse_close(RTPDemuxContext *s); Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Fri Oct 27 20:19:29 2006 @@ -60,6 +60,9 @@ struct MpegTSContext *ts; /* only used for MP2T payloads */ int read_buf_index; int read_buf_size; + /* used to send back RTCP RR */ + URLContext *rtp_ctx; + char hostname[256]; /* rtcp sender statistics receive */ int64_t last_rtcp_ntp_time; // TODO: move into statistics Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Fri Oct 27 20:19:29 2006 @@ -884,7 +884,7 @@ if (RTSP_RTP_PORT_MIN != 0) { while(j <= RTSP_RTP_PORT_MAX) { snprintf(buf, sizeof(buf), "rtp://?localport=%d", j); - if (url_open(&rtsp_st->rtp_handle, buf, URL_RDONLY) == 0) { + if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0) { j += 2; /* we will use two port by rtp stream (rtp and rtcp) */ goto rtp_opened; } @@ -981,7 +981,7 @@ host, reply->transports[0].server_port_min, ttl); - if (url_open(&rtsp_st->rtp_handle, url, URL_RDONLY) < 0) { + if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) { err = AVERROR_INVALIDDATA; goto fail; } @@ -994,7 +994,7 @@ st = s->streams[rtsp_st->stream_index]; if (!st) s->ctx_flags |= AVFMTCTX_NOHEADER; - rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); + rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); if (!rtsp_st->rtp_ctx) { err = AVERROR_NOMEM; @@ -1157,6 +1157,8 @@ case RTSP_PROTOCOL_RTP_UDP: case RTSP_PROTOCOL_RTP_UDP_MULTICAST: len = udp_read_packet(s, &rtsp_st, buf, sizeof(buf)); + if (rtsp_st->rtp_ctx) + rtp_check_and_send_back_rr(rtsp_st->rtp_ctx, len); break; } if (len < 0) @@ -1336,7 +1338,7 @@ inet_ntoa(rtsp_st->sdp_ip), rtsp_st->sdp_port, rtsp_st->sdp_ttl); - if (url_open(&rtsp_st->rtp_handle, url, URL_RDONLY) < 0) { + if (url_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) { err = AVERROR_INVALIDDATA; goto fail; } @@ -1346,7 +1348,7 @@ st = s->streams[rtsp_st->stream_index]; if (!st) s->ctx_flags |= AVFMTCTX_NOHEADER; - rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); + rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); if (!rtsp_st->rtp_ctx) { err = AVERROR_NOMEM; goto fail;

1 0

r6804 - in trunk/libavformat: rtp.c rtsp.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: gpoirier Date: Fri Oct 27 19:51:20 2006 New Revision: 6804 Modified: trunk/libavformat/rtp.c trunk/libavformat/rtsp.c Log: indentation fix, patch by Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Oct 27, 2006 6:17 AM Subject: Re: [Ffmpeg-devel] RTP patches & RFC Modified: trunk/libavformat/rtp.c ============================================================================== --- trunk/libavformat/rtp.c (original) +++ trunk/libavformat/rtp.c Fri Oct 27 19:51:20 2006 @@ -372,17 +372,17 @@ if(s->st && s->parse_packet) { return s->parse_packet(s, pkt, 0, NULL, 0); } else { - if (s->read_buf_index >= s->read_buf_size) - return -1; - ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, - s->read_buf_size - s->read_buf_index); - if (ret < 0) - return -1; - s->read_buf_index += ret; - if (s->read_buf_index < s->read_buf_size) - return 1; - else - return 0; + if (s->read_buf_index >= s->read_buf_size) + return -1; + ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, + s->read_buf_size - s->read_buf_index); + if (ret < 0) + return -1; + s->read_buf_index += ret; + if (s->read_buf_index < s->read_buf_size) + return 1; + else + return 0; } } @@ -460,8 +460,8 @@ if(s->parse_packet) { return s->parse_packet(s, pkt, timestamp, buf, len); } else { - av_new_packet(pkt, len); - memcpy(pkt->data, buf, len); + av_new_packet(pkt, len); + memcpy(pkt->data, buf, len); } break; } Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Fri Oct 27 19:51:20 2006 @@ -467,7 +467,7 @@ sdp_parse_fmtp(st, p); } } else { - sdp_parse_fmtp(st, p); + sdp_parse_fmtp(st, p); } } }

1 0

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

27 Oct '06

Author: ods15 Date: Fri Oct 27 18:42:16 2006 New Revision: 6803 Modified: trunk/libavcodec/eval.c trunk/libavcodec/eval.h Log: new optimized eval method, by seperating parsing and runtime Modified: trunk/libavcodec/eval.c ============================================================================== --- trunk/libavcodec/eval.c (original) +++ trunk/libavcodec/eval.c Fri Oct 27 18:42:16 2006 @@ -30,6 +30,7 @@ #include "avcodec.h" #include "mpegvideo.h" +#include "eval.h" #include <stdio.h> #include <stdlib.h> @@ -57,8 +58,6 @@ char **error; } Parser; -static double evalExpression(Parser *p); - static int8_t si_prefixes['z' - 'E' + 1]={ ['y'-'E']= -24, ['z'-'E']= -21, @@ -126,23 +125,82 @@ return 1; } -static double evalPrimary(Parser *p){ - double d, d2=NAN; +struct ff_expr_s { + enum { + e_value, e_const, e_func0, e_func1, e_func2, + e_squish, e_gauss, + e_mod, e_max, e_min, e_eq, e_gt, e_gte, + e_pow, e_mul, e_div, e_add, + } type; + double value; // is sign in other types + union { + int const_index; + double (*func0)(double); + double (*func1)(void *, double); + double (*func2)(void *, double, double); + } a; + AVEvalExpr * param[2]; +}; + +static double eval_expr(Parser * p, AVEvalExpr * e) { + switch (e->type) { + case e_value: return e->value; + case e_const: return e->value * p->const_value[e->a.const_index]; + case e_func0: return e->value * e->a.func0(eval_expr(p, e->param[0])); + case e_func1: return e->value * e->a.func1(p->opaque, eval_expr(p, e->param[0])); + 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); } + default: { + double d = eval_expr(p, e->param[0]); + double d2 = eval_expr(p, e->param[1]); + switch (e->type) { + case e_mod: return e->value * (d - floor(d/d2)*d2); + case e_max: return e->value * (d > d2 ? d : d2); + case e_min: return e->value * (d < d2 ? d : d2); + case e_eq: return e->value * (d == d2 ? 1.0 : 0.0); + case e_gt: return e->value * (d > d2 ? 1.0 : 0.0); + case e_gte: return e->value * (d >= d2 ? 1.0 : 0.0); + case e_pow: return e->value * pow(d, d2); + case e_mul: return e->value * (d * d2); + case e_div: return e->value * (d / d2); + case e_add: return e->value * (d + d2); + } + } + } + return NAN; +} + +static AVEvalExpr * parse_expr(Parser *p); + +void ff_eval_free(AVEvalExpr * e) { + if (!e) return; + ff_eval_free(e->param[0]); + ff_eval_free(e->param[1]); + av_freep(&e); +} + +static AVEvalExpr * parse_primary(Parser *p) { + AVEvalExpr * d = av_mallocz(sizeof(AVEvalExpr)); char *next= p->s; int i; /* number */ - d= av_strtod(p->s, &next); + d->value = av_strtod(p->s, &next); if(next != p->s){ + d->type = e_value; p->s= next; return d; } + d->value = 1; /* named constants */ for(i=0; p->const_name && p->const_name[i]; i++){ if(strmatch(p->s, p->const_name[i])){ p->s+= strlen(p->const_name[i]); - return p->const_value[i]; + d->type = e_const; + d->a.const_index = i; + return d; } } @@ -150,126 +208,198 @@ if(p->s==NULL){ *p->error = "missing ("; p->s= next; - return NAN; + ff_eval_free(d); + return NULL; } p->s++; // "(" - d= evalExpression(p); + if (*next == '(') { // special case do-nothing + av_freep(&d); + d = parse_expr(p); + if(p->s[0] != ')'){ + *p->error = "missing )"; + ff_eval_free(d); + return NULL; + } + p->s++; // ")" + return d; + } + d->param[0] = parse_expr(p); if(p->s[0]== ','){ p->s++; // "," - d2= evalExpression(p); + d->param[1] = parse_expr(p); } if(p->s[0] != ')'){ *p->error = "missing )"; - return NAN; + ff_eval_free(d); + return NULL; } p->s++; // ")" - if( strmatch(next, "sinh" ) ) d= sinh(d); - else if( strmatch(next, "cosh" ) ) d= cosh(d); - else if( strmatch(next, "tanh" ) ) d= tanh(d); - else if( strmatch(next, "sin" ) ) d= sin(d); - else if( strmatch(next, "cos" ) ) d= cos(d); - else if( strmatch(next, "tan" ) ) d= tan(d); - else if( strmatch(next, "atan" ) ) d= atan(d); - else if( strmatch(next, "asin" ) ) d= asin(d); - else if( strmatch(next, "acos" ) ) d= acos(d); - else if( strmatch(next, "exp" ) ) d= exp(d); - else if( strmatch(next, "log" ) ) d= log(d); - else if( strmatch(next, "squish") ) d= 1/(1+exp(4*d)); - else if( strmatch(next, "gauss" ) ) d= exp(-d*d/2)/sqrt(2*M_PI); - else if( strmatch(next, "abs" ) ) d= fabs(d); - else if( strmatch(next, "mod" ) ) d-= floor(d/d2)*d2; - else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2; - else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2; - else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0; - else if( strmatch(next, "gte" ) ) d= d >= d2 ? 1.0 : 0.0; - else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0; - else if( strmatch(next, "lte" ) ) d= d >= d2 ? 0.0 : 1.0; - else if( strmatch(next, "eq" ) ) d= d == d2 ? 1.0 : 0.0; - else if( strmatch(next, "(" ) ) d= d; -// else if( strmatch(next, "l1" ) ) d= 1 + d2*(d - 1); -// else if( strmatch(next, "sq01" ) ) d= (d >= 0.0 && d <=1.0) ? 1.0 : 0.0; - else{ + d->type = e_func0; + if( strmatch(next, "sinh" ) ) d->a.func0 = sinh; + else if( strmatch(next, "cosh" ) ) d->a.func0 = cosh; + else if( strmatch(next, "tanh" ) ) d->a.func0 = tanh; + else if( strmatch(next, "sin" ) ) d->a.func0 = sin; + else if( strmatch(next, "cos" ) ) d->a.func0 = cos; + else if( strmatch(next, "tan" ) ) d->a.func0 = tan; + else if( strmatch(next, "atan" ) ) d->a.func0 = atan; + else if( strmatch(next, "asin" ) ) d->a.func0 = asin; + else if( strmatch(next, "acos" ) ) d->a.func0 = acos; + else if( strmatch(next, "exp" ) ) d->a.func0 = exp; + else if( strmatch(next, "log" ) ) d->a.func0 = log; + else if( strmatch(next, "abs" ) ) d->a.func0 = fabs; + else if( strmatch(next, "squish") ) d->type = e_squish; + else if( strmatch(next, "gauss" ) ) d->type = e_gauss; + else if( strmatch(next, "mod" ) ) d->type = e_mod; + 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, "lte" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; } + else { for(i=0; p->func1_name && p->func1_name[i]; i++){ if(strmatch(next, p->func1_name[i])){ - return p->func1[i](p->opaque, d); + d->a.func1 = p->func1[i]; + d->type = e_func1; + return d; } } for(i=0; p->func2_name && p->func2_name[i]; i++){ if(strmatch(next, p->func2_name[i])){ - return p->func2[i](p->opaque, d, d2); + d->a.func2 = p->func2[i]; + d->type = e_func2; + return d; } } *p->error = "unknown function"; - return NAN; + ff_eval_free(d); + return NULL; } return d; } -static double evalPow(Parser *p, int *sign){ +static AVEvalExpr * parse_pow(Parser *p, int *sign){ *sign= (*p->s == '+') - (*p->s == '-'); p->s += *sign&1; - return evalPrimary(p); + return parse_primary(p); } -static double evalFactor(Parser *p){ +static AVEvalExpr * parse_factor(Parser *p){ int sign, sign2; - double ret, e; - ret= evalPow(p, &sign); + AVEvalExpr * e = parse_pow(p, &sign); while(p->s[0]=='^'){ + AVEvalExpr * tmp = av_mallocz(sizeof(AVEvalExpr)); + p->s++; - e= evalPow(p, &sign2); - ret= pow(ret, (sign2|1) * e); + + tmp->type = e_pow; + tmp->value = 1.; + tmp->param[0] = e; + tmp->param[1] = parse_pow(p, &sign2); + if (tmp->param[1]) tmp->param[1]->value *= (sign2|1); + e = tmp; } - return (sign|1) * ret; + if (e) e->value *= (sign|1); + return e; } -static double evalTerm(Parser *p){ - double ret= evalFactor(p); +static AVEvalExpr * parse_term(Parser *p){ + AVEvalExpr * e = parse_factor(p); while(p->s[0]=='*' || p->s[0]=='/'){ - if(*p->s++ == '*') ret*= evalFactor(p); - else ret/= evalFactor(p); + 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; } - return ret; + return e; } -static double evalExpression(Parser *p){ - double ret= 0; +static AVEvalExpr * parse_expr(Parser *p) { + AVEvalExpr * e; if(p->stack_index <= 0) //protect against stack overflows - return NAN; + return NULL; p->stack_index--; - do{ - ret += evalTerm(p); - }while(*p->s == '+' || *p->s == '-'); + 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; + }; p->stack_index++; - return ret; + return e; } -double ff_eval2(char *s, double *const_value, const char **const_name, +static int verify_expr(AVEvalExpr * e) { + if (!e) return 0; + switch (e->type) { + case e_value: + case e_const: return 1; + case e_func0: + case e_func1: + case e_squish: + case e_gauss: return verify_expr(e->param[0]); + default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); + } +} + +AVEvalExpr * ff_parse(char *s, const char **const_name, double (**func1)(void *, double), const char **func1_name, double (**func2)(void *, double, double), char **func2_name, - void *opaque, char **error){ + char **error){ Parser p; + AVEvalExpr * e; p.stack_index=100; p.s= s; - p.const_value= const_value; p.const_name = const_name; p.func1 = func1; p.func1_name = func1_name; p.func2 = func2; p.func2_name = func2_name; - p.opaque = opaque; p.error= error; - return evalExpression(&p); + e = parse_expr(&p); + if (!verify_expr(e)) { + ff_eval_free(e); + return NULL; + } + return e; +} + +double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) { + Parser p; + + p.const_value= const_value; + p.opaque = opaque; + return eval_expr(&p, e); +} + +double ff_eval2(char *s, double *const_value, const char **const_name, + double (**func1)(void *, double), const char **func1_name, + double (**func2)(void *, double, double), char **func2_name, + void *opaque, char **error){ + AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error); + double d; + if (!e) return NAN; + d = ff_parse_eval(e, const_value, opaque); + ff_eval_free(e); + return d; } #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) Modified: trunk/libavcodec/eval.h ============================================================================== --- trunk/libavcodec/eval.h (original) +++ trunk/libavcodec/eval.h Fri Oct 27 18:42:16 2006 @@ -39,4 +39,12 @@ double (**func2)(void *, double, double), char **func2_name, void *opaque, char **error); +typedef struct ff_expr_s AVEvalExpr; +AVEvalExpr * ff_parse(char *s, const char **const_name, + double (**func1)(void *, double), const char **func1_name, + double (**func2)(void *, double, double), char **func2_name, + char **error); +double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque); +void ff_eval_free(AVEvalExpr * e); + #endif /* AVCODEC_EVAL_H */

1 0

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

27 Oct '06

Author: gpoirier Date: Thu Oct 26 20:36:03 2006 New Revision: 6798 Added: trunk/libavformat/rtp_internal.h Modified: trunk/libavformat/allformats.c trunk/libavformat/allformats.h trunk/libavformat/rtp.c trunk/libavformat/rtp.h trunk/libavformat/rtsp.c Log: Add support for H264 over RTP Patch by Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Oct 9, 2006 4:55 PM Subject: [Ffmpeg-devel] RTP patches & RFC Actual committed patch: Date: Oct 26, 2006 4:29 PM Modified: trunk/libavformat/allformats.c ============================================================================== --- trunk/libavformat/allformats.c (original) +++ trunk/libavformat/allformats.c Thu Oct 26 20:36:03 2006 @@ -416,6 +416,7 @@ #ifdef CONFIG_REDIR_DEMUXER av_register_input_format(&redir_demuxer); #endif + av_register_rtp_dynamic_payload_handlers(); #endif /* CONFIG_NETWORK */ #ifdef CONFIG_SEGAFILM_DEMUXER av_register_input_format(&segafilm_demuxer); Modified: trunk/libavformat/allformats.h ============================================================================== --- trunk/libavformat/allformats.h (original) +++ trunk/libavformat/allformats.h Thu Oct 26 20:36:03 2006 @@ -170,6 +170,9 @@ /* rtsp.c */ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f); +/* rtp.c */ +void av_register_rtp_dynamic_payload_handlers(); + #if 0 extern AVImageFormat pnm_image_format; Modified: trunk/libavformat/rtp.c ============================================================================== --- trunk/libavformat/rtp.c (original) +++ trunk/libavformat/rtp.c Thu Oct 26 20:36:03 2006 @@ -33,6 +33,13 @@ #endif #include <netdb.h> +#include "rtp_internal.h" + +//#define RTP_H264 +#ifdef RTP_H264 + #include "rtp_h264.h" +#endif + //#define DEBUG @@ -179,42 +186,26 @@ {-1, "", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1} }; -AVRtpDynamicPayloadType_t AVRtpDynamicPayloadTypes[]= +/* statistics functions */ +RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; + +static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4}; +static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_MPEG4AAC}; + +static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) { - {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4}, - {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_MPEG4AAC}, - {"", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE} -}; + handler->next= RTPFirstDynamicPayloadHandler; + RTPFirstDynamicPayloadHandler= handler; +} -struct RTPDemuxContext { - AVFormatContext *ic; - AVStream *st; - int payload_type; - uint32_t ssrc; - uint16_t seq; - uint32_t timestamp; - uint32_t base_timestamp; - uint32_t cur_timestamp; - int max_payload_size; - MpegTSContext *ts; /* only used for MP2T payloads */ - int read_buf_index; - int read_buf_size; - - /* rtcp sender statistics receive */ - int64_t last_rtcp_ntp_time; - int64_t first_rtcp_ntp_time; - uint32_t last_rtcp_timestamp; - /* rtcp sender statistics */ - unsigned int packet_count; - unsigned int octet_count; - unsigned int last_octet_count; - int first_packet; - /* buffer for output */ - uint8_t buf[RTP_MAX_PACKET_LENGTH]; - uint8_t *buf_ptr; - /* special infos for au headers parsing */ - rtp_payload_data_t *rtp_payload_data; -}; +void av_register_rtp_dynamic_payload_handlers() +{ + register_dynamic_payload_handler(&mp4v_es_handler); + register_dynamic_payload_handler(&mpeg4_generic_handler); +#ifdef RTP_H264 + register_dynamic_payload_handler(&ff_h264_dynamic_handler); +#endif +} int rtp_get_codec_info(AVCodecContext *codec, int payload_type) { @@ -271,6 +262,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, int payload_type, rtp_payload_data_t *rtp_payload_data) { @@ -298,6 +290,9 @@ case CODEC_ID_MP2: case CODEC_ID_MP3: case CODEC_ID_MPEG4: +#ifdef RTP_H264 + case CODEC_ID_H264: +#endif st->need_parsing = 1; break; default: @@ -374,6 +369,9 @@ if (!buf) { /* return the next packets, if any */ + if(s->st && s->parse_packet) { + return s->parse_packet(s, pkt, 0, NULL, 0); + } else { if (s->read_buf_index >= s->read_buf_size) return -1; ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, @@ -385,6 +383,7 @@ return 1; else return 0; + } } if (len < 12) @@ -428,6 +427,7 @@ return 1; } } else { + // at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise. switch(st->codec->codec_id) { case CODEC_ID_MP2: /* better than nothing: skip mpeg audio RTP header */ @@ -457,8 +457,12 @@ memcpy(pkt->data, buf, len); break; default: + if(s->parse_packet) { + return s->parse_packet(s, pkt, timestamp, buf, len); + } else { av_new_packet(pkt, len); memcpy(pkt->data, buf, len); + } break; } @@ -511,6 +515,7 @@ void rtp_parse_close(RTPDemuxContext *s) { + // TODO: fold this into the protocol specific data fields. if (!strcmp(AVRtpPayloadTypes[s->payload_type].enc_name, "MP2T")) { mpegts_parse_close(s->ts); } Modified: trunk/libavformat/rtp.h ============================================================================== --- trunk/libavformat/rtp.h (original) +++ trunk/libavformat/rtp.h Thu Oct 26 20:36:03 2006 @@ -89,13 +89,6 @@ int audio_channels; } AVRtpPayloadType_t; -typedef struct AVRtpDynamicPayloadType_s /* payload type >= 96 */ -{ - const char enc_name[50]; /* XXX: still why 50 ? ;-) */ - enum CodecType codec_type; - enum CodecID codec_id; -} AVRtpDynamicPayloadType_t; - #if 0 typedef enum { RTCP_SR = 200, @@ -122,6 +115,4 @@ #endif extern AVRtpPayloadType_t AVRtpPayloadTypes[]; -extern AVRtpDynamicPayloadType_t AVRtpDynamicPayloadTypes[]; - #endif /* RTP_H */ Added: trunk/libavformat/rtp_internal.h ============================================================================== --- (empty file) +++ trunk/libavformat/rtp_internal.h Thu Oct 26 20:36:03 2006 @@ -0,0 +1,86 @@ +/* + * RTP definitions + * Copyright (c) 2006 Ryan Martell <rdm4 at martellventures.com> + * + * This library 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 of the License, or (at your option) any later version. + * + * This library 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 this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +// this is a bit of a misnomer, because rtp & rtsp internal structures and prototypes are in here. +#ifndef RTP_INTERNAL_H +#define RTP_INTERNAL_H + +typedef int (*DynamicPayloadPacketHandlerProc) (struct RTPDemuxContext * s, + AVPacket * pkt, + uint32_t timestamp, + const uint8_t * buf, + int len); + +typedef struct RTPDynamicProtocolHandler_s { + // fields from AVRtpDynamicPayloadType_s + const char enc_name[50]; /* XXX: still why 50 ? ;-) */ + enum CodecType codec_type; + enum CodecID codec_id; + + // may be null + int (*parse_sdp_a_line) (AVStream * stream, + void *protocol_data, + const char *line); ///< Parse the a= line from the sdp field + void *(*open) (); ///< allocate any data needed by the rtp parsing for this dynamic data. + void (*close)(void *protocol_data); ///< free any data needed by the rtp parsing for this dynamic data. + DynamicPayloadPacketHandlerProc parse_packet; ///< parse handler for this dynamic packet. + + struct RTPDynamicProtocolHandler_s *next; +} RTPDynamicProtocolHandler; + +// moved out of rtp.c, because the h264 decoder needs to know about this structure.. +struct RTPDemuxContext { + AVFormatContext *ic; + AVStream *st; + int payload_type; + uint32_t ssrc; + uint16_t seq; + uint32_t timestamp; + uint32_t base_timestamp; + uint32_t cur_timestamp; + int max_payload_size; + struct MpegTSContext *ts; /* only used for MP2T payloads */ + int read_buf_index; + int read_buf_size; + + /* rtcp sender statistics receive */ + int64_t last_rtcp_ntp_time; // TODO: move into statistics + int64_t first_rtcp_ntp_time; // TODO: move into statistics + uint32_t last_rtcp_timestamp; // TODO: move into statistics + + /* rtcp sender statistics */ + unsigned int packet_count; // TODO: move into statistics (outgoing) + unsigned int octet_count; // TODO: move into statistics (outgoing) + unsigned int last_octet_count; // TODO: move into statistics (outgoing) + int first_packet; + /* buffer for output */ + uint8_t buf[RTP_MAX_PACKET_LENGTH]; + uint8_t *buf_ptr; + + /* special infos for au headers parsing */ + rtp_payload_data_t *rtp_payload_data; // TODO: Move into dynamic payload handlers + + /* dynamic payload stuff */ + DynamicPayloadPacketHandlerProc parse_packet; ///< This is also copied from the dynamic protocol handler structure + void *dynamic_protocol_context; ///< This is a copy from the values setup from the sdp parsing, in rtsp.c don't free me. +}; + +extern RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler; +#endif /* RTP_INTERNAL_H */ + Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Thu Oct 26 20:36:03 2006 @@ -30,6 +30,8 @@ # include "barpainet.h" #endif +#include "rtp_internal.h" + //#define DEBUG //#define DEBUG_RTP_TCP @@ -69,6 +71,9 @@ int sdp_ttl; /* IP TTL (from SDP content - not used in RTSP) */ int sdp_payload_type; /* payload type - only used in SDP */ rtp_payload_data_t rtp_payload_data; /* rtp payload parsing infos from SDP */ + + RTPDynamicProtocolHandler *dynamic_handler; ///< Only valid if it's a dynamic protocol. (This is the handler structure) + void *dynamic_protocol_context; ///< Only valid if it's a dynamic protocol. (This is any private data associated with the dynamic protocol) } RTSPStream; static int rtsp_read_play(AVFormatContext *s); @@ -142,7 +147,7 @@ /* parse the rtpmap description: <codec_name>/<clock_rate>[/<other params>] */ -static int sdp_parse_rtpmap(AVCodecContext *codec, int payload_type, const char *p) +static int sdp_parse_rtpmap(AVCodecContext *codec, RTSPStream *rtsp_st, int payload_type, const char *p) { char buf[256]; int i; @@ -153,12 +158,18 @@ see if we can handle this kind of payload */ get_word_sep(buf, sizeof(buf), "/", &p); if (payload_type >= RTP_PT_PRIVATE) { - /* We are in dynmaic payload type case ... search into AVRtpDynamicPayloadTypes[] */ - for (i = 0; AVRtpDynamicPayloadTypes[i].codec_id != CODEC_ID_NONE; ++i) - if (!strcmp(buf, AVRtpDynamicPayloadTypes[i].enc_name) && (codec->codec_type == AVRtpDynamicPayloadTypes[i].codec_type)) { - codec->codec_id = AVRtpDynamicPayloadTypes[i].codec_id; + RTPDynamicProtocolHandler *handler= RTPFirstDynamicPayloadHandler; + while(handler) { + if (!strcmp(buf, handler->enc_name) && (codec->codec_type == handler->codec_type)) { + codec->codec_id = handler->codec_id; + rtsp_st->dynamic_handler= handler; + if(handler->open) { + rtsp_st->dynamic_protocol_context= handler->open(); + } break; } + handler= handler->next; + } } else { /* We are in a standard case ( from http://www.iana.org/assignments/rtp-parameters) */ /* search into AVRtpPayloadTypes[] */ @@ -440,7 +451,7 @@ st = s->streams[i]; rtsp_st = st->priv_data; if (rtsp_st->sdp_payload_type == payload_type) { - sdp_parse_rtpmap(st->codec, payload_type, p); + sdp_parse_rtpmap(st->codec, rtsp_st, payload_type, p); } } } else if (strstart(p, "fmtp:", &p)) { @@ -451,7 +462,13 @@ 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) { + if(!rtsp_st->dynamic_handler->parse_sdp_a_line(st, rtsp_st->dynamic_protocol_context, buf)) { + sdp_parse_fmtp(st, p); + } + } else { sdp_parse_fmtp(st, p); + } } } } @@ -788,6 +805,8 @@ rtp_parse_close(rtsp_st->rtp_ctx); if (rtsp_st->rtp_handle) url_close(rtsp_st->rtp_handle); + if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context) + rtsp_st->dynamic_handler->close(rtsp_st->dynamic_protocol_context); } av_free(rtsp_st); } @@ -980,6 +999,11 @@ if (!rtsp_st->rtp_ctx) { err = AVERROR_NOMEM; goto fail; + } else { + if(rtsp_st->dynamic_handler) { + rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context; + rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet; + } } } @@ -1326,6 +1350,11 @@ if (!rtsp_st->rtp_ctx) { err = AVERROR_NOMEM; goto fail; + } else { + if(rtsp_st->dynamic_handler) { + rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context; + rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet; + } } } return 0;

7 7

r6802 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: bcoudurier Date: Fri Oct 27 12:53:08 2006 New Revision: 6802 Modified: trunk/libavformat/utils.c Log: fflags can/will be used for muxing too Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Fri Oct 27 12:53:08 2006 @@ -330,7 +330,7 @@ {"probesize", NULL, OFFSET(probesize), FF_OPT_TYPE_INT, 32000, 32, INT_MAX, D}, /* 32000 from mpegts.c: 1.0 second at 24Mbit/s */ {"muxrate", "set mux rate", OFFSET(mux_rate), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E}, {"packetsize", "set packet size", OFFSET(packet_size), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E}, -{"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D, "fflags"}, +{"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D|E, "fflags"}, {"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"}, {"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"}, {"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},

1 0

r6801 - trunk/libavformat/rtp_internal.h
by subversion＠mplayerhq.hu 27 Oct '06

27 Oct '06

Author: gpoirier Date: Fri Oct 27 08:06:58 2006 New Revision: 6801 Modified: trunk/libavformat/rtp_internal.h Log: Last fix of licence header Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Fri Oct 27 08:06:58 2006 @@ -15,7 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */

1 0

r6800 - trunk/libavformat/rtp_internal.h
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: gpoirier Date: Fri Oct 27 00:45:19 2006 New Revision: 6800 Modified: trunk/libavformat/rtp_internal.h Log: move licence header fixes Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Fri Oct 27 00:45:19 2006 @@ -2,7 +2,9 @@ * RTP definitions * Copyright (c) 2006 Ryan Martell <rdm4 at martellventures.com> * - * This library is free software; you can redistribute it and/or + * 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.

1 0

r6799 - trunk/libavformat/rtp_internal.h
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: gpoirier Date: Fri Oct 27 00:40:18 2006 New Revision: 6799 Modified: trunk/libavformat/rtp_internal.h Log: Fix licence header (aka <pedantic mode='on' /> ) Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Fri Oct 27 00:40:18 2006 @@ -5,9 +5,9 @@ * This library 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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.

1 0

r6797 - trunk/doc/ffmpeg-doc.texi
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: diego Date: Thu Oct 26 18:21:41 2006 New Revision: 6797 Modified: trunk/doc/ffmpeg-doc.texi Log: wording/grammar Modified: trunk/doc/ffmpeg-doc.texi ============================================================================== --- trunk/doc/ffmpeg-doc.texi (original) +++ trunk/doc/ffmpeg-doc.texi Thu Oct 26 18:21:41 2006 @@ -483,11 +483,11 @@ Force audio codec to @var{codec}. Use the @code{copy} special value to specify that the raw codec data must be copied as is. @item -newaudio -It will add a new audio track to the output file. If you want to -specify parameters, specify them before @code{-newaudio} (@code{-acodec}, @code{-ab}, etc..) +Add a new audio track to the output file. If you want to specify parameters, +do so before @code{-newaudio} (@code{-acodec}, @code{-ab}, etc..). -Mapping will be done automatically, if output streams number is equal to -input streams number, else it will pick first one found which match. You +Mapping will be done automatically, if the number of output streams is equal to +the number of input streams, else it will pick the first one that matches. You can override the mapping using @code{-map} as usual. Example:

2 1

r6796 - trunk/doc/ffmpeg-doc.texi
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: gpoirier Date: Thu Oct 26 16:26:21 2006 New Revision: 6796 Modified: trunk/doc/ffmpeg-doc.texi Log: Document -newaudio, patch by Victor Paesa, taken from an explanation written by Baptiste Coudurier in -users Modified: trunk/doc/ffmpeg-doc.texi ============================================================================== --- trunk/doc/ffmpeg-doc.texi (original) +++ trunk/doc/ffmpeg-doc.texi Thu Oct 26 16:26:21 2006 @@ -482,6 +482,18 @@ @item -acodec codec Force audio codec to @var{codec}. Use the @code{copy} special value to specify that the raw codec data must be copied as is. + at item -newaudio +It will add a new audio track to the output file. If you want to +specify parameters, specify them before @code{-newaudio} (@code{-acodec}, @code{-ab}, etc..) + +Mapping will be done automatically, if output streams number is equal to +input streams number, else it will pick first one found which match. You +can override the mapping using @code{-map} as usual. + +Example: + at example +ffmpeg -i file.mpg -vcodec copy -acodec ac3 -ab 384 test.mpg -acodec mp2 -ab 192 -newaudio + at end example @end table @section Audio/Video grab options

1 0

r6795 - in trunk/libavcodec: Makefile avcodec.h gifdec.c lzw.c lzw.h tiff.c
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: kostya Date: Thu Oct 26 06:15:48 2006 New Revision: 6795 Added: trunk/libavcodec/lzw.c - copied, changed from r6793, /trunk/libavcodec/gifdec.c trunk/libavcodec/lzw.h Modified: trunk/libavcodec/Makefile trunk/libavcodec/avcodec.h trunk/libavcodec/gifdec.c trunk/libavcodec/tiff.c Log: LZW decoder as separate module plus TIFF LZW support Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Thu Oct 26 06:15:48 2006 @@ -81,7 +81,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o -OBJS-$(CONFIG_GIF_DECODER) += gifdec.o +OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_H261_DECODER) += h261.o OBJS-$(CONFIG_H261_ENCODER) += h261.o OBJS-$(CONFIG_H264_DECODER) += h264.o @@ -132,7 +132,7 @@ OBJS-$(CONFIG_SVQ3_DECODER) += h264.o OBJS-$(CONFIG_TARGA_DECODER) += targa.o OBJS-$(CONFIG_THEORA_DECODER) += vp3.o -OBJS-$(CONFIG_TIFF_DECODER) += tiff.o +OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Thu Oct 26 06:15:48 2006 @@ -37,8 +37,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(21<<8)+0) -#define LIBAVCODEC_VERSION 51.21.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(22<<8)+0) +#define LIBAVCODEC_VERSION 51.22.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Thu Oct 26 06:15:48 2006 @@ -24,9 +24,7 @@ #include "avcodec.h" #include "bytestream.h" - -#define MAXBITS 12 -#define SIZTABLE (1<<MAXBITS) +#include "lzw.h" #define GCE_DISPOSAL_NONE 0 #define GCE_DISPOSAL_INPLACE 1 @@ -50,175 +48,16 @@ /* LZW compatible decoder */ uint8_t *bytestream; - int eob_reached; - uint8_t *pbuf, *ebuf; - int bbits; - unsigned int bbuf; - - int cursize; /* The current code size */ - int curmask; - int codesize; - int clear_code; - int end_code; - int newcodes; /* First available code */ - int top_slot; /* Highest code for current size */ - int slot; /* Last read code */ - int fc, oc; - uint8_t *sp; - uint8_t stack[SIZTABLE]; - uint8_t suffix[SIZTABLE]; - uint16_t prefix[SIZTABLE]; + LZWState *lzw; /* aux buffers */ uint8_t global_palette[256 * 3]; uint8_t local_palette[256 * 3]; - uint8_t buf[256]; } GifState; static const uint8_t gif87a_sig[6] = "GIF87a"; static const uint8_t gif89a_sig[6] = "GIF89a"; -static const uint16_t mask[17] = -{ - 0x0000, 0x0001, 0x0003, 0x0007, - 0x000F, 0x001F, 0x003F, 0x007F, - 0x00FF, 0x01FF, 0x03FF, 0x07FF, - 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF -}; - -static void GLZWDecodeInit(GifState * s, int csize) -{ - /* read buffer */ - s->eob_reached = 0; - s->pbuf = s->buf; - s->ebuf = s->buf; - s->bbuf = 0; - s->bbits = 0; - - /* decoder */ - s->codesize = csize; - s->cursize = s->codesize + 1; - s->curmask = mask[s->cursize]; - s->top_slot = 1 << s->cursize; - s->clear_code = 1 << s->codesize; - s->end_code = s->clear_code + 1; - s->slot = s->newcodes = s->clear_code + 2; - s->oc = s->fc = 0; - s->sp = s->stack; -} - -/* XXX: optimize */ -static inline int GetCode(GifState * s) -{ - int c, sizbuf; - uint8_t *ptr; - - while (s->bbits < s->cursize) { - ptr = s->pbuf; - if (ptr >= s->ebuf) { - if (!s->eob_reached) { - sizbuf = bytestream_get_byte(&s->bytestream); - s->ebuf = s->buf + sizbuf; - s->pbuf = s->buf; - if (sizbuf > 0) { - bytestream_get_buffer(&s->bytestream, s->buf, sizbuf); - } else { - s->eob_reached = 1; - } - } - ptr = s->pbuf; - } - s->bbuf |= ptr[0] << s->bbits; - ptr++; - s->pbuf = ptr; - s->bbits += 8; - } - c = s->bbuf & s->curmask; - s->bbuf >>= s->cursize; - s->bbits -= s->cursize; - return c; -} - -/* NOTE: the algorithm here is inspired from the LZW GIF decoder - written by Steven A. Bennett in 1987. */ -/* return the number of byte decoded */ -static int GLZWDecode(GifState * s, uint8_t * buf, int len) -{ - int l, c, code, oc, fc; - uint8_t *sp; - - if (s->end_code < 0) - return 0; - - l = len; - sp = s->sp; - oc = s->oc; - fc = s->fc; - - while (sp > s->stack) { - *buf++ = *(--sp); - if ((--l) == 0) - goto the_end; - } - - for (;;) { - c = GetCode(s); - if (c == s->end_code) { - s->end_code = -1; - break; - } else if (c == s->clear_code) { - s->cursize = s->codesize + 1; - s->curmask = mask[s->cursize]; - s->slot = s->newcodes; - s->top_slot = 1 << s->cursize; - while ((c = GetCode(s)) == s->clear_code); - if (c == s->end_code) { - s->end_code = -1; - break; - } - /* test error */ - if (c >= s->slot) - c = 0; - fc = oc = c; - *buf++ = c; - if ((--l) == 0) - break; - } else { - code = c; - if (code >= s->slot) { - *sp++ = fc; - code = oc; - } - while (code >= s->newcodes) { - *sp++ = s->suffix[code]; - code = s->prefix[code]; - } - *sp++ = code; - if (s->slot < s->top_slot) { - s->suffix[s->slot] = fc = code; - s->prefix[s->slot++] = oc; - oc = c; - } - if (s->slot >= s->top_slot) { - if (s->cursize < MAXBITS) { - s->top_slot <<= 1; - s->curmask = mask[++s->cursize]; - } - } - while (sp > s->stack) { - *buf++ = *(--sp); - if ((--l) == 0) - goto the_end; - } - } - } - the_end: - s->sp = sp; - s->oc = oc; - s->fc = fc; - return len - l; -} - static int gif_read_image(GifState *s) { int left, top, width, height, bits_per_pixel, code_size, flags; @@ -267,7 +106,8 @@ /* now get the image data */ code_size = bytestream_get_byte(&s->bytestream); - GLZWDecodeInit(s, code_size); + //TODO: add proper data size + ff_lzw_decode_init(s->lzw, code_size, s->bytestream, 0, FF_LZW_GIF); /* read all the image */ linesize = s->picture.linesize[0]; @@ -276,7 +116,7 @@ pass = 0; y1 = 0; for (y = 0; y < height; y++) { - GLZWDecode(s, ptr, width); + ff_lzw_decode(s->lzw, ptr, width); if (is_interleaved) { switch(pass) { default: @@ -314,8 +154,8 @@ av_free(line); /* read the garbage data until end marker is found */ - while (!s->eob_reached) - GetCode(s); + ff_lzw_decode_tail(s->lzw); + s->bytestream = ff_lzw_cur_ptr(s->lzw); return 0; } @@ -445,6 +285,7 @@ avcodec_get_frame_defaults(&s->picture); avctx->coded_frame= &s->picture; s->picture.data[0] = NULL; + ff_lzw_decode_open(&s->lzw); return 0; } @@ -483,6 +324,7 @@ { GifState *s = avctx->priv_data; + ff_lzw_decode_close(&s->lzw); if(s->picture.data[0]) avctx->release_buffer(avctx, &s->picture); return 0; Copied: trunk/libavcodec/lzw.c (from r6793, /trunk/libavcodec/gifdec.c) ============================================================================== --- /trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/lzw.c Thu Oct 26 06:15:48 2006 @@ -1,7 +1,7 @@ /* - * GIF decoder + * LZW decoder * Copyright (c) 2003 Fabrice Bellard. - * Copyright (c) 2006 Baptiste Coudurier. + * Copyright (c) 2006 Konstantin Shishkov. * * This file is part of FFmpeg. * @@ -20,80 +20,128 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG +/** + * @file lzw.c + * @brief LZW decoding routines + * @author Fabrice Bellard + * Modified for use in TIFF by Konstantin Shishkov + */ #include "avcodec.h" -#include "bytestream.h" +#include "lzw.h" -#define MAXBITS 12 -#define SIZTABLE (1<<MAXBITS) +#define LZW_MAXBITS 12 +#define LZW_SIZTABLE (1<<LZW_MAXBITS) -#define GCE_DISPOSAL_NONE 0 -#define GCE_DISPOSAL_INPLACE 1 -#define GCE_DISPOSAL_BACKGROUND 2 -#define GCE_DISPOSAL_RESTORE 3 - -typedef struct GifState { - AVFrame picture; - int screen_width; - int screen_height; - int bits_per_pixel; - int background_color_index; - int transparent_color_index; - int color_resolution; - uint32_t *image_palette; - - /* after the frame is displayed, the disposal method is used */ - int gce_disposal; - /* delay during which the frame is shown */ - int gce_delay; +static const uint16_t mask[17] = +{ + 0x0000, 0x0001, 0x0003, 0x0007, + 0x000F, 0x001F, 0x003F, 0x007F, + 0x00FF, 0x01FF, 0x03FF, 0x07FF, + 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF +}; - /* LZW compatible decoder */ - uint8_t *bytestream; +struct LZWState { int eob_reached; uint8_t *pbuf, *ebuf; int bbits; unsigned int bbuf; - int cursize; /* The current code size */ + int mode; ///< Decoder mode + int cursize; ///< The current code size int curmask; int codesize; int clear_code; int end_code; - int newcodes; /* First available code */ - int top_slot; /* Highest code for current size */ - int slot; /* Last read code */ + int newcodes; ///< First available code + int top_slot; ///< Highest code for current size + int top_slot2; ///< Highest possible code for current size (<=top_slot) + int slot; ///< Last read code int fc, oc; uint8_t *sp; - uint8_t stack[SIZTABLE]; - uint8_t suffix[SIZTABLE]; - uint16_t prefix[SIZTABLE]; - - /* aux buffers */ - uint8_t global_palette[256 * 3]; - uint8_t local_palette[256 * 3]; - uint8_t buf[256]; -} GifState; + uint8_t stack[LZW_SIZTABLE]; + uint8_t suffix[LZW_SIZTABLE]; + uint16_t prefix[LZW_SIZTABLE]; + int bs; ///< current buffer size for GIF +}; -static const uint8_t gif87a_sig[6] = "GIF87a"; -static const uint8_t gif89a_sig[6] = "GIF89a"; +/* get one code from stream */ +static int lzw_get_code(struct LZWState * s) +{ + int c, sizbuf; -static const uint16_t mask[17] = + if(s->mode == FF_LZW_GIF) { + while (s->bbits < s->cursize) { + if (!s->bs) { + sizbuf = *s->pbuf++; + s->bs = sizbuf; + if(!sizbuf) { + s->eob_reached = 1; + } + } + s->bbuf |= (*s->pbuf++) << s->bbits; + s->bbits += 8; + s->bs--; + } + c = s->bbuf & s->curmask; + s->bbuf >>= s->cursize; + } else { // TIFF + while (s->bbits < s->cursize) { + if (s->pbuf >= s->ebuf) { + s->eob_reached = 1; + } + s->bbuf = (s->bbuf << 8) | (*s->pbuf++); + s->bbits += 8; + } + c = (s->bbuf >> (s->bbits - s->cursize)) & s->curmask; + } + s->bbits -= s->cursize; + return c; +} + +uint8_t* ff_lzw_cur_ptr(LZWState *p) { - 0x0000, 0x0001, 0x0003, 0x0007, - 0x000F, 0x001F, 0x003F, 0x007F, - 0x00FF, 0x01FF, 0x03FF, 0x07FF, - 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF -}; + return ((struct LZWState*)p)->pbuf; +} -static void GLZWDecodeInit(GifState * s, int csize) +void ff_lzw_decode_tail(LZWState *p) { + struct LZWState *s = (struct LZWState *)p; + while(!s->eob_reached) + lzw_get_code(s); +} + +void ff_lzw_decode_open(LZWState **p) +{ + *p = av_mallocz(sizeof(struct LZWState)); +} + +void ff_lzw_decode_close(LZWState **p) +{ + av_freep(p); +} + +/** + * Initialize LZW decoder + * @param s LZW context + * @param csize initial code size in bits + * @param buf input data + * @param buf_size input data size + * @param mode decoder working mode - either GIF or TIFF + */ +int ff_lzw_decode_init(LZWState *p, int csize, uint8_t *buf, int buf_size, int mode) +{ + struct LZWState *s = (struct LZWState *)p; + + if(csize < 1 || csize > LZW_MAXBITS) + return -1; /* read buffer */ s->eob_reached = 0; - s->pbuf = s->buf; - s->ebuf = s->buf; + s->pbuf = buf; + s->ebuf = s->pbuf + buf_size; s->bbuf = 0; s->bbits = 0; + s->bs = 0; /* decoder */ s->codesize = csize; @@ -105,47 +153,35 @@ s->slot = s->newcodes = s->clear_code + 2; s->oc = s->fc = 0; s->sp = s->stack; -} - -/* XXX: optimize */ -static inline int GetCode(GifState * s) -{ - int c, sizbuf; - uint8_t *ptr; - while (s->bbits < s->cursize) { - ptr = s->pbuf; - if (ptr >= s->ebuf) { - if (!s->eob_reached) { - sizbuf = bytestream_get_byte(&s->bytestream); - s->ebuf = s->buf + sizbuf; - s->pbuf = s->buf; - if (sizbuf > 0) { - bytestream_get_buffer(&s->bytestream, s->buf, sizbuf); - } else { - s->eob_reached = 1; - } - } - ptr = s->pbuf; - } - s->bbuf |= ptr[0] << s->bbits; - ptr++; - s->pbuf = ptr; - s->bbits += 8; + s->mode = mode; + switch(s->mode){ + case FF_LZW_GIF: + s->top_slot2 = s->top_slot; + break; + case FF_LZW_TIFF: + s->top_slot2 = s->top_slot - 1; + break; + default: + return -1; } - c = s->bbuf & s->curmask; - s->bbuf >>= s->cursize; - s->bbits -= s->cursize; - return c; + return 0; } -/* NOTE: the algorithm here is inspired from the LZW GIF decoder - written by Steven A. Bennett in 1987. */ -/* return the number of byte decoded */ -static int GLZWDecode(GifState * s, uint8_t * buf, int len) -{ +/** + * Decode given number of bytes + * NOTE: the algorithm here is inspired from the LZW GIF decoder + * written by Steven A. Bennett in 1987. + * + * @param s LZW context + * @param buf output buffer + * @param len number of bytes to decode + * @return number of bytes decoded + */ +int ff_lzw_decode(LZWState *p, uint8_t *buf, int len){ int l, c, code, oc, fc; uint8_t *sp; + struct LZWState *s = (struct LZWState *)p; if (s->end_code < 0) return 0; @@ -162,7 +198,7 @@ } for (;;) { - c = GetCode(s); + c = lzw_get_code(s); if (c == s->end_code) { s->end_code = -1; break; @@ -171,7 +207,10 @@ s->curmask = mask[s->cursize]; s->slot = s->newcodes; s->top_slot = 1 << s->cursize; - while ((c = GetCode(s)) == s->clear_code); + s->top_slot2 = s->top_slot; + if(s->mode == FF_LZW_TIFF) + s->top_slot2--; + while ((c = lzw_get_code(s)) == s->clear_code); if (c == s->end_code) { s->end_code = -1; break; @@ -199,9 +238,12 @@ s->prefix[s->slot++] = oc; oc = c; } - if (s->slot >= s->top_slot) { - if (s->cursize < MAXBITS) { + if (s->slot >= s->top_slot2) { + if (s->cursize < LZW_MAXBITS) { s->top_slot <<= 1; + s->top_slot2 = s->top_slot; + if(s->mode == FF_LZW_TIFF) + s->top_slot2--; s->curmask = mask[++s->cursize]; } } @@ -218,283 +260,3 @@ s->fc = fc; return len - l; } - -static int gif_read_image(GifState *s) -{ - int left, top, width, height, bits_per_pixel, code_size, flags; - int is_interleaved, has_local_palette, y, pass, y1, linesize, n, i; - uint8_t *ptr, *line, *spal, *palette, *ptr1; - - left = bytestream_get_le16(&s->bytestream); - top = bytestream_get_le16(&s->bytestream); - width = bytestream_get_le16(&s->bytestream); - height = bytestream_get_le16(&s->bytestream); - flags = bytestream_get_byte(&s->bytestream); - is_interleaved = flags & 0x40; - has_local_palette = flags & 0x80; - bits_per_pixel = (flags & 0x07) + 1; -#ifdef DEBUG - dprintf("gif: image x=%d y=%d w=%d h=%d\n", left, top, width, height); -#endif - - if (has_local_palette) { - bytestream_get_buffer(&s->bytestream, s->local_palette, 3 * (1 << bits_per_pixel)); - palette = s->local_palette; - } else { - palette = s->global_palette; - bits_per_pixel = s->bits_per_pixel; - } - - /* verify that all the image is inside the screen dimensions */ - if (left + width > s->screen_width || - top + height > s->screen_height) - return -EINVAL; - - /* build the palette */ - n = (1 << bits_per_pixel); - spal = palette; - for(i = 0; i < n; i++) { - s->image_palette[i] = (0xff << 24) | - (spal[0] << 16) | (spal[1] << 8) | (spal[2]); - spal += 3; - } - for(; i < 256; i++) - s->image_palette[i] = (0xff << 24); - /* handle transparency */ - if (s->transparent_color_index >= 0) - s->image_palette[s->transparent_color_index] = 0; - line = NULL; - - /* now get the image data */ - code_size = bytestream_get_byte(&s->bytestream); - GLZWDecodeInit(s, code_size); - - /* read all the image */ - linesize = s->picture.linesize[0]; - ptr1 = s->picture.data[0] + top * linesize + (left * 3); - ptr = ptr1; - pass = 0; - y1 = 0; - for (y = 0; y < height; y++) { - GLZWDecode(s, ptr, width); - if (is_interleaved) { - switch(pass) { - default: - case 0: - case 1: - y1 += 8; - ptr += linesize * 8; - if (y1 >= height) { - y1 = 4; - if (pass == 0) - ptr = ptr1 + linesize * 4; - else - ptr = ptr1 + linesize * 2; - pass++; - } - break; - case 2: - y1 += 4; - ptr += linesize * 4; - if (y1 >= height) { - y1 = 1; - ptr = ptr1 + linesize; - pass++; - } - break; - case 3: - y1 += 2; - ptr += linesize * 2; - break; - } - } else { - ptr += linesize; - } - } - av_free(line); - - /* read the garbage data until end marker is found */ - while (!s->eob_reached) - GetCode(s); - return 0; -} - -static int gif_read_extension(GifState *s) -{ - int ext_code, ext_len, i, gce_flags, gce_transparent_index; - - /* extension */ - ext_code = bytestream_get_byte(&s->bytestream); - ext_len = bytestream_get_byte(&s->bytestream); -#ifdef DEBUG - dprintf("gif: ext_code=0x%x len=%d\n", ext_code, ext_len); -#endif - switch(ext_code) { - case 0xf9: - if (ext_len != 4) - goto discard_ext; - s->transparent_color_index = -1; - gce_flags = bytestream_get_byte(&s->bytestream); - s->gce_delay = bytestream_get_le16(&s->bytestream); - gce_transparent_index = bytestream_get_byte(&s->bytestream); - if (gce_flags & 0x01) - s->transparent_color_index = gce_transparent_index; - else - s->transparent_color_index = -1; - s->gce_disposal = (gce_flags >> 2) & 0x7; -#ifdef DEBUG - dprintf("gif: gce_flags=%x delay=%d tcolor=%d disposal=%d\n", - gce_flags, s->gce_delay, - s->transparent_color_index, s->gce_disposal); -#endif - ext_len = bytestream_get_byte(&s->bytestream); - break; - } - - /* NOTE: many extension blocks can come after */ - discard_ext: - while (ext_len != 0) { - for (i = 0; i < ext_len; i++) - bytestream_get_byte(&s->bytestream); - ext_len = bytestream_get_byte(&s->bytestream); -#ifdef DEBUG - dprintf("gif: ext_len1=%d\n", ext_len); -#endif - } - return 0; -} - -static int gif_read_header1(GifState *s) -{ - uint8_t sig[6]; - int v, n; - int has_global_palette; - - /* read gif signature */ - bytestream_get_buffer(&s->bytestream, sig, 6); - if (memcmp(sig, gif87a_sig, 6) != 0 && - memcmp(sig, gif89a_sig, 6) != 0) - return -1; - - /* read screen header */ - s->transparent_color_index = -1; - s->screen_width = bytestream_get_le16(&s->bytestream); - s->screen_height = bytestream_get_le16(&s->bytestream); - if( (unsigned)s->screen_width > 32767 - || (unsigned)s->screen_height > 32767){ - av_log(NULL, AV_LOG_ERROR, "picture size too large\n"); - return -1; - } - - v = bytestream_get_byte(&s->bytestream); - s->color_resolution = ((v & 0x70) >> 4) + 1; - has_global_palette = (v & 0x80); - s->bits_per_pixel = (v & 0x07) + 1; - s->background_color_index = bytestream_get_byte(&s->bytestream); - bytestream_get_byte(&s->bytestream); /* ignored */ -#ifdef DEBUG - dprintf("gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", - s->screen_width, s->screen_height, s->bits_per_pixel, - has_global_palette); -#endif - if (has_global_palette) { - n = 1 << s->bits_per_pixel; - bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3); - } - return 0; -} - -static int gif_parse_next_image(GifState *s) -{ - int ret, code; - - for (;;) { - code = bytestream_get_byte(&s->bytestream); -#ifdef DEBUG - dprintf("gif: code=%02x '%c'\n", code, code); -#endif - switch (code) { - case ',': - if (gif_read_image(s) < 0) - return -1; - ret = 0; - goto the_end; - case ';': - /* end of image */ - ret = -1; - goto the_end; - case '!': - if (gif_read_extension(s) < 0) - return -1; - break; - case EOF: - default: - /* error or errneous EOF */ - ret = -1; - goto the_end; - } - } - the_end: - return ret; -} - -static int gif_decode_init(AVCodecContext *avctx) -{ - GifState *s = avctx->priv_data; - - avcodec_get_frame_defaults(&s->picture); - avctx->coded_frame= &s->picture; - s->picture.data[0] = NULL; - return 0; -} - -static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) -{ - GifState *s = avctx->priv_data; - AVFrame *picture = data; - int ret; - - s->bytestream = buf; - if (gif_read_header1(s) < 0) - return -1; - - avctx->pix_fmt = PIX_FMT_PAL8; - if (avcodec_check_dimensions(avctx, s->screen_width, s->screen_height)) - return -1; - avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); - - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - if (avctx->get_buffer(avctx, &s->picture) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; - } - s->image_palette = (uint32_t *)s->picture.data[1]; - ret = gif_parse_next_image(s); - if (ret < 0) - return ret; - - *picture = s->picture; - *data_size = sizeof(AVPicture); - return 0; -} - -static int gif_decode_close(AVCodecContext *avctx) -{ - GifState *s = avctx->priv_data; - - if(s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - return 0; -} - -AVCodec gif_decoder = { - "gif", - CODEC_TYPE_VIDEO, - CODEC_ID_GIF, - sizeof(GifState), - gif_decode_init, - NULL, - gif_decode_close, - gif_decode_frame, -}; Added: trunk/libavcodec/lzw.h ============================================================================== --- (empty file) +++ trunk/libavcodec/lzw.h Thu Oct 26 06:15:48 2006 @@ -0,0 +1,49 @@ +/* + * LZW decoder + * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2006 Konstantin Shishkov. + * + * 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 lzw.h + * @brief LZW decoding routines + * @author Fabrice Bellard + * Modified for use in TIFF by Konstantin Shishkov + */ + +#ifndef LZW_H +#define LZW_H + +enum FF_LZW_MODES{ + FF_LZW_GIF, + FF_LZW_TIFF +}; + +/* clients should not know what LZWState is */ +typedef void LZWState; + +/* first two functions de/allocate memory for LZWState */ +void ff_lzw_decode_open(LZWState **p); +void ff_lzw_decode_close(LZWState **p); +int ff_lzw_decode_init(LZWState *s, int csize, uint8_t *buf, int buf_size, int mode); +int ff_lzw_decode(LZWState *s, uint8_t *buf, int len); +uint8_t* ff_lzw_cur_ptr(LZWState *lzw); +void ff_lzw_decode_tail(LZWState *lzw); + +#endif Modified: trunk/libavcodec/tiff.c ============================================================================== --- trunk/libavcodec/tiff.c (original) +++ trunk/libavcodec/tiff.c Thu Oct 26 06:15:48 2006 @@ -23,6 +23,7 @@ #ifdef CONFIG_ZLIB #include <zlib.h> #endif +#include "lzw.h" /* abridged list of TIFF tags */ enum TiffTags{ @@ -74,6 +75,7 @@ uint8_t* stripdata; uint8_t* stripsizes; int stripsize, stripoff; + LZWState *lzw; } TiffContext; static int tget_short(uint8_t **p, int le){ @@ -126,6 +128,12 @@ return 0; } #endif + if(s->compr == TIFF_LZW){ + if(ff_lzw_decode_init(s->lzw, 8, src, size, FF_LZW_TIFF) < 0){ + av_log(s->avctx, AV_LOG_ERROR, "Error initializing LZW decoder\n"); + return -1; + } + } for(line = 0; line < lines; line++){ if(src - ssrc > size){ av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n"); @@ -160,6 +168,13 @@ } } break; + case TIFF_LZW: + pixels = ff_lzw_decode(s->lzw, dst, width); + if(pixels < width){ + av_log(s->avctx, AV_LOG_ERROR, "Decoded only %i bytes of %i\n", pixels, width); + return -1; + } + break; } dst += stride; } @@ -247,6 +262,7 @@ switch(s->compr){ case TIFF_RAW: case TIFF_PACKBITS: + case TIFF_LZW: break; case TIFF_DEFLATE: case TIFF_ADOBE_DEFLATE: @@ -256,9 +272,6 @@ av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n"); return -1; #endif - case TIFF_LZW: - av_log(s->avctx, AV_LOG_ERROR, "LZW: not implemented yet\n"); - return -1; case TIFF_G3: av_log(s->avctx, AV_LOG_ERROR, "CCITT G3 compression is not supported\n"); return -1; @@ -405,6 +418,7 @@ avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame= (AVFrame*)&s->picture; s->picture.data[0] = NULL; + ff_lzw_decode_open(&s->lzw); return 0; } @@ -413,6 +427,7 @@ { TiffContext * const s = avctx->priv_data; + ff_lzw_decode_close(&s->lzw); if(s->picture.data[0]) avctx->release_buffer(avctx, &s->picture); return 0;

1 0

r6794 - trunk/libavcodec/tiff.c
by subversion＠mplayerhq.hu 26 Oct '06

26 Oct '06

Author: kostya Date: Thu Oct 26 06:06:08 2006 New Revision: 6794 Modified: trunk/libavcodec/tiff.c Log: 10l predictor should not skip first line Modified: trunk/libavcodec/tiff.c ============================================================================== --- trunk/libavcodec/tiff.c (original) +++ trunk/libavcodec/tiff.c Thu Oct 26 06:06:08 2006 @@ -335,7 +335,7 @@ return -1; } if(value == 2){ - src = pic->data[0] + pic->linesize[0]; + src = pic->data[0]; stride = pic->linesize[0]; soff = s->bpp >> 3; ssize = s->width * soff;

1 0

r6793 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 25 Oct '06

25 Oct '06

Author: bcoudurier Date: Thu Oct 26 00:50:49 2006 New Revision: 6793 Modified: trunk/libavformat/mov.c Log: remove mov_read_leaf and remove useless reading function table, mov_read_default will skip atom with no parsing function anyway Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Thu Oct 26 00:50:49 2006 @@ -305,14 +305,6 @@ mov_parse_function func; } MOVParseTableEntry; -static int mov_read_leaf(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) -{ - if (atom.size>1) - url_fskip(pb, atom.size); -/* url_seek(pb, atom_offset+atom.size, SEEK_SET); */ - return 0; -} - static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { int64_t total_size = 0; @@ -1416,80 +1408,37 @@ static const MOVParseTableEntry mov_default_parse_table[] = { /* mp4 atoms */ { MKTAG( 'c', 'o', '6', '4' ), mov_read_stco }, -{ MKTAG( 'c', 'p', 'r', 't' ), mov_read_default }, -{ MKTAG( 'c', 'r', 'h', 'd' ), mov_read_default }, { MKTAG( 'c', 't', 't', 's' ), mov_read_ctts }, /* composition time to sample */ -{ MKTAG( 'd', 'i', 'n', 'f' ), mov_read_default }, /* data information */ -{ MKTAG( 'd', 'p', 'n', 'd' ), mov_read_leaf }, -{ MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf }, { MKTAG( 'e', 'd', 't', 's' ), mov_read_default }, { MKTAG( 'e', 'l', 's', 't' ), mov_read_elst }, { MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda }, -{ MKTAG( 'f', 'r', 'e', 'e' ), mov_read_leaf }, { MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp }, { MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr }, -{ MKTAG( 'h', 'i', 'n', 't' ), mov_read_leaf }, -{ MKTAG( 'h', 'm', 'h', 'd' ), mov_read_leaf }, -{ MKTAG( 'i', 'o', 'd', 's' ), mov_read_leaf }, { MKTAG( 'j', 'p', '2', 'h' ), mov_read_jp2h }, { MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat }, { MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd }, { MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default }, { MKTAG( 'm', 'i', 'n', 'f' ), mov_read_default }, { MKTAG( 'm', 'o', 'o', 'v' ), mov_read_moov }, -{ MKTAG( 'm', 'p', '4', 'a' ), mov_read_default }, -{ MKTAG( 'm', 'p', '4', 's' ), mov_read_default }, -{ MKTAG( 'm', 'p', '4', 'v' ), mov_read_default }, -{ MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf }, { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd }, -{ MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf }, -{ MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default }, -{ MKTAG( 's', 'd', 'h', 'd' ), mov_read_default }, -{ MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf }, -{ MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */ { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */ { MKTAG( 'a', 'l', 'a', 'c' ), mov_read_alac }, /* alac specific atom */ { MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC }, { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco }, -{ MKTAG( 's', 't', 'd', 'p' ), mov_read_default }, { MKTAG( 's', 't', 's', 'c' ), mov_read_stsc }, { MKTAG( 's', 't', 's', 'd' ), mov_read_stsd }, /* sample description */ -{ MKTAG( 's', 't', 's', 'h' ), mov_read_default }, { MKTAG( 's', 't', 's', 's' ), mov_read_stss }, /* sync sample */ { MKTAG( 's', 't', 's', 'z' ), mov_read_stsz }, /* sample size */ { 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( 't', 'r', 'e', 'f' ), mov_read_default }, /* not really */ -{ MKTAG( 'u', 'd', 't', 'a' ), mov_read_leaf }, -{ MKTAG( 'u', 'r', 'l', ' ' ), mov_read_leaf }, -{ MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf }, -{ MKTAG( 'u', 'u', 'i', 'd' ), mov_read_leaf }, -{ MKTAG( 'v', 'm', 'h', 'd' ), mov_read_leaf }, /* video media info header */ { MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave }, -/* extra mp4 */ -{ MKTAG( 'M', 'D', 'E', 'S' ), mov_read_leaf }, -/* QT atoms */ -{ MKTAG( 'c', 'h', 'a', 'p' ), mov_read_leaf }, -{ MKTAG( 'c', 'l', 'i', 'p' ), mov_read_default }, -{ MKTAG( 'c', 'r', 'g', 'n' ), mov_read_leaf }, { MKTAG( 'c', 't', 'a', 'b' ), mov_read_ctab }, { MKTAG( 'e', 's', 'd', 's' ), mov_read_esds }, -{ MKTAG( 'k', 'm', 'a', 't' ), mov_read_leaf }, -{ MKTAG( 'm', 'a', 't', 't' ), mov_read_default }, -{ MKTAG( 'r', 'd', 'r', 'f' ), mov_read_leaf }, -{ MKTAG( 'r', 'm', 'd', 'a' ), mov_read_default }, -{ MKTAG( 'r', 'm', 'd', 'r' ), mov_read_leaf }, -{ MKTAG( 'r', 'm', 'r', 'a' ), mov_read_default }, -{ MKTAG( 's', 'c', 'p', 't' ), mov_read_leaf }, -{ MKTAG( 's', 's', 'r', 'c' ), mov_read_leaf }, -{ MKTAG( 's', 'y', 'n', 'c' ), mov_read_leaf }, -{ MKTAG( 't', 'c', 'm', 'd' ), mov_read_leaf }, { MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */ -//{ MKTAG( 'r', 'm', 'q', 'u' ), mov_read_leaf }, { MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov }, -{ 0L, mov_read_leaf } +{ 0L, NULL } }; static void mov_free_stream_context(MOVStreamContext *sc)

1 0

r6792 - trunk/libavformat/swf.c
by subversion＠mplayerhq.hu 25 Oct '06

25 Oct '06

Author: aurel Date: Wed Oct 25 22:05:14 2006 New Revision: 6792 Modified: trunk/libavformat/swf.c Log: fix mp3 in swf decoding Modified: trunk/libavformat/swf.c ============================================================================== --- trunk/libavformat/swf.c (original) +++ trunk/libavformat/swf.c Wed Oct 25 22:05:14 2006 @@ -854,6 +854,7 @@ } ast->codec->codec_type = CODEC_TYPE_AUDIO; ast->codec->codec_id = CODEC_ID_MP3; + ast->need_parsing = 1; } } else { url_fskip(pb, len); @@ -896,7 +897,8 @@ for( i=0; i<s->nb_streams; i++ ) { st = s->streams[i]; if (st->id == 1) { - av_get_packet(pb, pkt, len); + url_fskip(pb, 4); + av_get_packet(pb, pkt, len-4); pkt->stream_index = st->index; return pkt->size; }

1 0

r6791 - trunk/configure
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: mru Date: Tue Oct 24 23:58:50 2006 New Revision: 6791 Modified: trunk/configure Log: libdts and lame sometimes need -lm Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Oct 24 23:58:50 2006 @@ -1302,9 +1302,9 @@ fi # these are off by default, so fail if requested and not available -enabled dts && require libdts dts.h dts_init -ldts +enabled dts && require libdts dts.h dts_init -ldts -lm enabled libgsm && require libgsm gsm.h gsm_create -lgsm -enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame +enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg enabled xvid && require XviD xvid.h xvid_global -lxvidcore

1 0

r6790 - in trunk/libavcodec: vp5.c vp56.h vp56data.c vp56data.h vp5data.h vp6.c vp6data.h
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: diego Date: Tue Oct 24 20:57:43 2006 New Revision: 6790 Modified: trunk/libavcodec/vp5.c trunk/libavcodec/vp56.h trunk/libavcodec/vp56data.c trunk/libavcodec/vp56data.h trunk/libavcodec/vp5data.h trunk/libavcodec/vp6.c trunk/libavcodec/vp6data.h Log: Don't include inttypes.h/stdint.h directly, there is an abstraction in libavutil/common.h for platforms with no inttypes.h. patch by Steve Lhomme, slhomme divxcorp com Modified: trunk/libavcodec/vp5.c ============================================================================== --- trunk/libavcodec/vp5.c (original) +++ trunk/libavcodec/vp5.c Tue Oct 24 20:57:43 2006 @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> -#include <inttypes.h> #include "avcodec.h" #include "dsputil.h" Modified: trunk/libavcodec/vp56.h ============================================================================== --- trunk/libavcodec/vp56.h (original) +++ trunk/libavcodec/vp56.h Tue Oct 24 20:57:43 2006 @@ -24,8 +24,6 @@ #ifndef VP56_H #define VP56_H -#include <stdint.h> - #include "vp56data.h" #include "dsputil.h" #include "mpegvideo.h" Modified: trunk/libavcodec/vp56data.c ============================================================================== --- trunk/libavcodec/vp56data.c (original) +++ trunk/libavcodec/vp56data.c Tue Oct 24 20:57:43 2006 @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> #include "vp56data.h" const uint8_t vp56_b6to3[] = { 0, 0, 0, 0, 1, 2 }; Modified: trunk/libavcodec/vp56data.h ============================================================================== --- trunk/libavcodec/vp56data.h (original) +++ trunk/libavcodec/vp56data.h Tue Oct 24 20:57:43 2006 @@ -24,7 +24,7 @@ #ifndef VP56DATA_H #define VP56DATA_H -#include <inttypes.h> +#include "common.h" typedef enum { VP56_FRAME_CURRENT = 0, Modified: trunk/libavcodec/vp5data.h ============================================================================== --- trunk/libavcodec/vp5data.h (original) +++ trunk/libavcodec/vp5data.h Tue Oct 24 20:57:43 2006 @@ -24,8 +24,6 @@ #ifndef VP5DATA_H #define VP5DATA_H -#include <inttypes.h> - static const uint8_t vp5_coeff_groups[] = { -1, 0, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, Modified: trunk/libavcodec/vp6.c ============================================================================== --- trunk/libavcodec/vp6.c (original) +++ trunk/libavcodec/vp6.c Tue Oct 24 20:57:43 2006 @@ -27,7 +27,6 @@ */ #include <stdlib.h> -#include <inttypes.h> #include "avcodec.h" #include "dsputil.h" Modified: trunk/libavcodec/vp6data.h ============================================================================== --- trunk/libavcodec/vp6data.h (original) +++ trunk/libavcodec/vp6data.h Tue Oct 24 20:57:43 2006 @@ -24,7 +24,6 @@ #ifndef VP6DATA_H #define VP6DATA_H -#include <inttypes.h> #include "vp56data.h" static const uint8_t vp6_def_fdv_vector_model[2][8] = {

1 0

r6789 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 12:33:40 2006 New Revision: 6789 Modified: trunk/libavcodec/jpeg_ls.c Log: simplify Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 12:33:40 2006 @@ -204,17 +204,13 @@ downscale_state(state, Q); if(state->B[Q] <= -state->N[Q]) { - state->B[Q] += state->N[Q]; + state->B[Q]= FFMAX(state->B[Q] + state->N[Q], 1-state->N[Q]); if(state->C[Q] > -128) state->C[Q]--; - if(state->B[Q] <= -state->N[Q]) - state->B[Q] = -state->N[Q] + 1; }else if(state->B[Q] > 0){ - state->B[Q] -= state->N[Q]; + state->B[Q]= FFMIN(state->B[Q] - state->N[Q], 0); if(state->C[Q] < 127) state->C[Q]++; - if(state->B[Q] > 0) - state->B[Q] = 0; } return err;

1 0

r6788 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 12:13:26 2006 New Revision: 6788 Modified: trunk/libavcodec/jpeg_ls.c Log: reverse my last change, it was wrong and broken Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 12:13:26 2006 @@ -532,7 +532,7 @@ */ static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){ int k; - int val; + int val, map; int Q = 365 + RItype; int temp; @@ -540,13 +540,14 @@ if(RItype) temp += state->N[Q] >> 1; for(k = 0; (state->N[Q] << k) < temp; k++); - if(!k && (2 * state->B[Q] < state->N[Q])) - err= -err; + map = 0; + if(!k && err && (2 * state->B[Q] < state->N[Q])) + map = 1; if(err < 0) - val = - (2 * err) - 1 - RItype; + val = - (2 * err) - 1 - RItype + map; else - val = 2 * err - RItype; + val = 2 * err - RItype - map; set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp); if(err < 0)

1 0

r6787 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 11:45:21 2006 New Revision: 6787 Modified: trunk/libavcodec/jpeg_ls.c Log: remove map variable Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 11:45:21 2006 @@ -532,7 +532,7 @@ */ static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){ int k; - int val, map; + int val; int Q = 365 + RItype; int temp; @@ -540,14 +540,13 @@ if(RItype) temp += state->N[Q] >> 1; for(k = 0; (state->N[Q] << k) < temp; k++); - map = 0; - if(!k && err && (2 * state->B[Q] < state->N[Q])) - map = 1; + if(!k && (2 * state->B[Q] < state->N[Q])) + err= -err; if(err < 0) - val = - (2 * err) - 1 - RItype + map; + val = - (2 * err) - 1 - RItype; else - val = 2 * err - RItype - map; + val = 2 * err - RItype; set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp); if(err < 0)

1 0

r6786 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 11:34:13 2006 New Revision: 6786 Modified: trunk/libavcodec/jpeg_ls.c Log: factorize update state out Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 11:34:13 2006 @@ -187,6 +187,38 @@ return 0; } +static void inline downscale_state(JLSState *state, int Q){ + if(state->N[Q] == state->reset){ + state->A[Q] >>=1; + state->B[Q] >>=1; + state->N[Q] >>=1; + } + state->N[Q]++; +} + +static inline int update_state_regular(JLSState *state, int Q, int err){ + state->A[Q] += FFABS(err); + err *= state->twonear; + state->B[Q] += err; + + downscale_state(state, Q); + + if(state->B[Q] <= -state->N[Q]) { + state->B[Q] += state->N[Q]; + if(state->C[Q] > -128) + state->C[Q]--; + if(state->B[Q] <= -state->N[Q]) + state->B[Q] = -state->N[Q] + 1; + }else if(state->B[Q] > 0){ + state->B[Q] -= state->N[Q]; + if(state->C[Q] < 127) + state->C[Q]++; + if(state->B[Q] > 0) + state->B[Q] = 0; + } + + return err; +} /** * Get context-dependent Golomb code, decode it and update context @@ -211,30 +243,7 @@ if(!state->near && !k && (2 * state->B[Q] <= -state->N[Q])) ret = -(ret + 1); - state->A[Q] += FFABS(ret); - ret *= state->twonear; - state->B[Q] += ret; - - if(state->N[Q] == state->reset) { - state->A[Q] >>= 1; - state->B[Q] >>= 1; - state->N[Q] >>= 1; - } - state->N[Q]++; - - if(state->B[Q] <= -state->N[Q]) { - state->B[Q] += state->N[Q]; - if(state->C[Q] > -128) - state->C[Q]--; - if(state->B[Q] <= -state->N[Q]) - state->B[Q] = -state->N[Q] + 1; - }else if(state->B[Q] > 0){ - state->B[Q] -= state->N[Q]; - if(state->C[Q] < 127) - state->C[Q]++; - if(state->B[Q] > 0) - state->B[Q] = 0; - } + ret= update_state_regular(state, Q, ret); return ret; } @@ -273,12 +282,7 @@ /* update state */ state->A[Q] += FFABS(ret) - RItype; ret *= state->twonear; - if(state->N[Q] == state->reset){ - state->A[Q] >>=1; - state->B[Q] >>=1; - state->N[Q] >>=1; - } - state->N[Q]++; + downscale_state(state, Q); return ret; } @@ -520,29 +524,7 @@ set_ur_golomb_jpegls(pb, val, k, state->limit, state->qbpp); - state->A[Q] += FFABS(err); - state->B[Q] += err * state->twonear; - - if(state->N[Q] == state->reset) { - state->A[Q] >>= 1; - state->B[Q] >>= 1; - state->N[Q] >>= 1; - } - state->N[Q]++; - - if(state->B[Q] <= -state->N[Q]) { - state->B[Q] += state->N[Q]; - if(state->C[Q] > -128) - state->C[Q]--; - if(state->B[Q] <= -state->N[Q]) - state->B[Q] = -state->N[Q] + 1; - }else if(state->B[Q] > 0){ - state->B[Q] -= state->N[Q]; - if(state->C[Q] < 127) - state->C[Q]++; - if(state->B[Q] > 0) - state->B[Q] = 0; - } + update_state_regular(state, Q, err); } /** @@ -572,12 +554,7 @@ state->B[Q]++; state->A[Q] += (val + 1 - RItype) >> 1; - if(state->N[Q] == state->reset) { - state->A[Q] >>= 1; - state->B[Q] >>= 1; - state->N[Q] >>= 1; - } - state->N[Q]++; + downscale_state(state, Q); } /**

1 0

r6785 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 11:09:38 2006 New Revision: 6785 Modified: trunk/libavcodec/jpeg_ls.c Log: FFMAX Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 11:09:38 2006 @@ -77,9 +77,7 @@ state->limit = (4 * state->bpp) - state->qbpp; for(i = 0; i < 367; i++) { - state->A[i] = (state->range + 32) >> 6; - if(state->A[i] < 2) - state->A[i] = 2; + state->A[i] = FFMAX((state->range + 32) >> 6, 2); state->N[i] = 1; }

1 0

r6784 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 10:52:51 2006 New Revision: 6784 Modified: trunk/libavcodec/jpeg_ls.c Log: common subexpression elimination Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 10:52:51 2006 @@ -248,10 +248,9 @@ int k, ret, temp, map; int Q = 365 + RItype; - if(!RItype) - temp = state->A[Q]; - else - temp = state->A[Q] + (state->N[Q] >> 1); + temp= state->A[Q]; + if(RItype) + temp += state->N[Q] >> 1; for(k = 0; (state->N[Q] << k) < temp; k++); @@ -355,17 +354,6 @@ else pred = Rb + err; } - - if(state->near){ - if(pred < -state->near) - pred += state->range * state->twonear; - else if(pred > state->maxval + state->near) - pred -= state->range * state->twonear; - pred = clip(pred, 0, state->maxval); - } - - W(dst, x, pred); - x += stride; } else { /* regular mode */ int context, sign; @@ -389,17 +377,17 @@ /* we have to do something more for near-lossless coding */ pred += err; - if(state->near) { - if(pred < -state->near) - pred += state->range * state->twonear; - else if(pred > state->maxval + state->near) - pred -= state->range * state->twonear; - pred = clip(pred, 0, state->maxval); - } - - W(dst, x, pred); - x += stride; } + if(state->near){ + if(pred < -state->near) + pred += state->range * state->twonear; + else if(pred > state->maxval + state->near) + pred -= state->range * state->twonear; + pred = clip(pred, 0, state->maxval); + } + + W(dst, x, pred); + x += stride; } } @@ -677,7 +665,6 @@ if(state->run_index[comp] > 0) state->run_index[comp]--; - x += stride; } else { /* regular mode */ int context; @@ -708,8 +695,8 @@ } ls_encode_regular(state, pb, context, err); - x += stride; } + x += stride; } }

1 0

r6783 - trunk/libavcodec/jpeg_ls.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 10:33:44 2006 New Revision: 6783 Modified: trunk/libavcodec/jpeg_ls.c Log: merge 8 and 16bit functions, they are identical except the data type Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 10:33:44 2006 @@ -286,10 +286,12 @@ return ret; } +#define R(a, i ) (bits == 8 ? ((uint8_t*)(a))[i] : ((uint16_t*)(a))[i] ) +#define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v)) /** * Decode one line of image */ -static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, uint8_t *last, uint8_t *dst, int last2, int w, int stride, int comp){ +static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *last, void *dst, int last2, int w, int stride, int comp, int bits){ int i, x = 0; int Ra, Rb, Rc, Rd; int D0, D1, D2; @@ -298,10 +300,10 @@ int err, pred; /* compute gradients */ - Ra = x ? dst[x - stride] : last[x]; - Rb = last[x]; - Rc = x ? last[x - stride] : last2; - Rd = (x >= w - stride) ? last[x] : last[x + stride]; + Ra = x ? R(dst, x - stride) : R(last, x); + Rb = R(last, x); + Rc = x ? R(last, x - stride) : last2; + Rd = (x >= w - stride) ? R(last, x) : R(last, x + stride); D0 = Rd - Rb; D1 = Rb - Rc; D2 = Rc - Ra; @@ -318,7 +320,7 @@ r = (w - x) / stride; } for(i = 0; i < r; i++) { - dst[x] = Ra; + W(dst, x, Ra); x += stride; } /* if EOL reached, we stop decoding */ @@ -334,12 +336,12 @@ if(r) r = get_bits_long(&s->gb, r); for(i = 0; i < r; i++) { - dst[x] = Ra; + W(dst, x, Ra); x += stride; } /* decode run termination value */ - Rb = last[x]; + Rb = R(last, x); RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0; err = ls_get_code_runterm(&s->gb, state, RItype, log2_run[state->run_index[comp]]); if(state->run_index[comp]) @@ -362,7 +364,7 @@ pred = clip(pred, 0, state->maxval); } - dst[x] = pred; + W(dst, x, pred); x += stride; } else { /* regular mode */ int context, sign; @@ -395,122 +397,7 @@ pred = clip(pred, 0, state->maxval); } - dst[x] = pred; - x += stride; - } - } -} - -/** - * Decode one line of image - 16bpp version - */ -static inline void ls_decode_line_16bpp(JLSState *state, MJpegDecodeContext *s, uint16_t *last, uint16_t *dst, int last2, int w, int stride, int comp){ - int i, x = 0; - int Ra, Rb, Rc, Rd; - int D0, D1, D2; - - while(x < w) { - int err, pred; - - /* compute gradients */ - Ra = x ? dst[x - stride] : last[x]; - Rb = last[x]; - Rc = x ? last[x - stride] : last2; - Rd = (x >= w - stride) ? last[x] : last[x + stride]; - D0 = Rd - Rb; - D1 = Rb - Rc; - D2 = Rc - Ra; - /* run mode */ - if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) { - int r; - int RItype; - - /* decode full runs while available */ - while(get_bits1(&s->gb)) { - int r; - r = 1 << log2_run[state->run_index[comp]]; - if(x + r * stride > w) { - r = (w - x) / stride; - } - for(i = 0; i < r; i++) { - dst[x] = Ra; - x += stride; - } - /* if EOL reached, we stop decoding */ - if(r != (1 << log2_run[state->run_index[comp]])) - return; - if(state->run_index[comp] < 31) - state->run_index[comp]++; - if(x + stride > w) - return; - } - /* decode aborted run */ - r = log2_run[state->run_index[comp]]; - if(r) - r = get_bits_long(&s->gb, r); - for(i = 0; i < r; i++) { - dst[x] = Ra; - x += stride; - } - - /* decode run termination value */ - Rb = last[x]; - RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0; - err = ls_get_code_runterm(&s->gb, state, RItype, log2_run[state->run_index[comp]]); - if(state->run_index[comp]) - state->run_index[comp]--; - - if(state->near && RItype){ - pred = Ra + err; - } else { - if(Rb < Ra) - pred = Rb - err; - else - pred = Rb + err; - } - - if(state->near){ - if(pred < -state->near) - pred += state->range * state->twonear; - else if(pred > state->maxval + state->near) - pred -= state->range * state->twonear; - pred = clip(pred, 0, state->maxval); - } - - dst[x] = pred; - x += stride; - } else { /* regular mode */ - int context, sign; - - context = quantize(state, D0) * 81 + quantize(state, D1) * 9 + quantize(state, D2); - pred = mid_pred(Ra, Ra + Rb - Rc, Rb); - - if(context < 0){ - context = -context; - sign = 1; - }else{ - sign = 0; - } - - if(sign){ - pred = clip(pred - state->C[context], 0, state->maxval); - err = -ls_get_code_regular(&s->gb, state, context); - } else { - pred = clip(pred + state->C[context], 0, state->maxval); - err = ls_get_code_regular(&s->gb, state, context); - } - - /* we have to do something more for near-lossless coding */ - pred += err; - if(state->near) { - if(pred < -state->near) - pred += state->range * state->twonear; - else if(pred > state->maxval + state->near) - pred -= state->range * state->twonear; - pred = clip(pred, 0, state->maxval); - } - - dst[x] = pred; + W(dst, x, pred); x += stride; } } @@ -552,10 +439,10 @@ cur += off; for(i = 0; i < s->height; i++) { if(s->bits <= 8){ - ls_decode_line(state, s, last, cur, t, width, stride, off); + ls_decode_line(state, s, last, cur, t, width, stride, off, 8); t = last[0]; }else{ - ls_decode_line_16bpp(state, s, last, cur, t, width, stride, off); + ls_decode_line(state, s, last, cur, t, width, stride, off, 16); t = *((uint16_t*)last); } last = cur; @@ -573,7 +460,7 @@ width = s->width * 3; for(i = 0; i < s->height; i++) { for(j = 0; j < 3; j++) { - ls_decode_line(state, s, last + j, cur + j, Rc[j], width, 3, j); + ls_decode_line(state, s, last + j, cur + j, Rc[j], width, 3, j, 8); Rc[j] = last[j]; if (s->restart_interval && !--s->restart_count) { @@ -730,106 +617,7 @@ /** * Encode one line of image */ -static inline void ls_encode_line(JLSState *state, PutBitContext *pb, uint8_t *last, uint8_t *cur, int last2, int w, int stride, int comp){ - int x = 0; - int Ra, Rb, Rc, Rd; - int D0, D1, D2; - - while(x < w) { - int err, pred, sign; - - /* compute gradients */ - Ra = x ? cur[x - stride] : last[x]; - Rb = last[x]; - Rc = x ? last[x - stride] : last2; - Rd = (x >= w - stride) ? last[x] : last[x + stride]; - D0 = Rd - Rb; - D1 = Rb - Rc; - D2 = Rc - Ra; - - /* run mode */ - if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) { - int RUNval, RItype, run; - - run = 0; - RUNval = Ra; - while(x < w && (FFABS(cur[x] - RUNval) <= state->near)){ - run++; - cur[x] = Ra; - x += stride; - } - ls_encode_run(state, pb, run, comp, x < w); - if(x >= w) - return; - Rb = last[x]; - RItype = (FFABS(Ra - Rb) <= state->near); - pred = RItype ? Ra : Rb; - err = cur[x] - pred; - - if(!RItype && Ra > Rb) - err = -err; - - if(state->near){ - if(err > 0) - err = (state->near + err) / state->twonear; - else - err = -(state->near - err) / state->twonear; - - if(RItype || (Rb >= Ra)) - Ra = clip(pred + err * state->twonear, 0, state->maxval); - else - Ra = clip(pred - err * state->twonear, 0, state->maxval); - cur[x] = Ra; - } - if(err < 0) - err += state->range; - if(err >= ((state->range + 1) >> 1)) - err -= state->range; - - ls_encode_runterm(state, pb, RItype, err, log2_run[state->run_index[comp]]); - - if(state->run_index[comp] > 0) - state->run_index[comp]--; - x += stride; - } else { /* regular mode */ - int context; - - context = quantize(state, D0) * 81 + quantize(state, D1) * 9 + quantize(state, D2); - pred = mid_pred(Ra, Ra + Rb - Rc, Rb); - - if(context < 0){ - context = -context; - sign = 1; - pred = clip(pred - state->C[context], 0, state->maxval); - err = pred - cur[x]; - }else{ - sign = 0; - pred = clip(pred + state->C[context], 0, state->maxval); - err = cur[x] - pred; - } - - if(state->near){ - if(err > 0) - err = (state->near + err) / state->twonear; - else - err = -(state->near - err) / state->twonear; - if(!sign) - Ra = clip(pred + err * state->twonear, 0, state->maxval); - else - Ra = clip(pred - err * state->twonear, 0, state->maxval); - cur[x] = Ra; - } - - ls_encode_regular(state, pb, context, err); - x += stride; - } - } -} - -/** - * Encode one line of image with 16 bpp sample size - */ -static inline void ls_encode_line_16bpp(JLSState *state, PutBitContext *pb, uint16_t *last, uint16_t *cur, int last2, int w, int stride, int comp){ +static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last, void *cur, int last2, int w, int stride, int comp, int bits){ int x = 0; int Ra, Rb, Rc, Rd; int D0, D1, D2; @@ -838,10 +626,10 @@ int err, pred, sign; /* compute gradients */ - Ra = x ? cur[x - stride] : last[x]; - Rb = last[x]; - Rc = x ? last[x - stride] : last2; - Rd = (x >= w - stride) ? last[x] : last[x + stride]; + Ra = x ? R(cur, x - stride) : R(last, x); + Rb = R(last, x); + Rc = x ? R(last, x - stride) : last2; + Rd = (x >= w - stride) ? R(last, x) : R(last, x + stride); D0 = Rd - Rb; D1 = Rb - Rc; D2 = Rc - Ra; @@ -852,18 +640,18 @@ run = 0; RUNval = Ra; - while(x < w && (FFABS(cur[x] - RUNval) <= state->near)){ + while(x < w && (FFABS(R(cur, x) - RUNval) <= state->near)){ run++; - cur[x] = Ra; + W(cur, x, Ra); x += stride; } ls_encode_run(state, pb, run, comp, x < w); if(x >= w) return; - Rb = last[x]; + Rb = R(last, x); RItype = (FFABS(Ra - Rb) <= state->near); pred = RItype ? Ra : Rb; - err = cur[x] - pred; + err = R(cur, x) - pred; if(!RItype && Ra > Rb) err = -err; @@ -878,7 +666,7 @@ Ra = clip(pred + err * state->twonear, 0, state->maxval); else Ra = clip(pred - err * state->twonear, 0, state->maxval); - cur[x] = Ra; + W(cur, x, Ra); } if(err < 0) err += state->range; @@ -900,11 +688,11 @@ context = -context; sign = 1; pred = clip(pred - state->C[context], 0, state->maxval); - err = pred - cur[x]; + err = pred - R(cur, x); }else{ sign = 0; pred = clip(pred + state->C[context], 0, state->maxval); - err = cur[x] - pred; + err = R(cur, x) - pred; } if(state->near){ @@ -916,7 +704,7 @@ Ra = clip(pred + err * state->twonear, 0, state->maxval); else Ra = clip(pred - err * state->twonear, 0, state->maxval); - cur[x] = Ra; + W(cur, x, Ra); } ls_encode_regular(state, pb, context, err); @@ -1012,7 +800,7 @@ int t = 0; for(i = 0; i < avctx->height; i++) { - ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0); + ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 8); t = last[0]; last = cur; cur += p->linesize[0]; @@ -1021,7 +809,7 @@ int t = 0; for(i = 0; i < avctx->height; i++) { - ls_encode_line_16bpp(state, &pb2, last, cur, t, avctx->width, 1, 0); + ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 16); t = *((uint16_t*)last); last = cur; cur += p->linesize[0]; @@ -1033,7 +821,7 @@ width = avctx->width * 3; for(i = 0; i < avctx->height; i++) { for(j = 0; j < 3; j++) { - ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j); + ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8); Rc[j] = last[j]; } last = cur; @@ -1046,7 +834,7 @@ width = avctx->width * 3; for(i = 0; i < avctx->height; i++) { for(j = 2; j >= 0; j--) { - ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j); + ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8); Rc[j] = last[j]; } last = cur;

1 0