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

r6782 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: michael Date: Tue Oct 24 09:33:39 2006 New Revision: 6782 Modified: trunk/libavcodec/mpeg12.c Log: set v_edge_pos correctly for field picture mpeg2 Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Tue Oct 24 09:33:39 2006 @@ -2390,10 +2390,12 @@ s->chroma_420_type = get_bits1(&s->gb); s->progressive_frame = get_bits1(&s->gb); - if(s->picture_structure == PICT_FRAME) + if(s->picture_structure == PICT_FRAME){ s->first_field=0; - else{ + s->v_edge_pos= 16*s->mb_height; + }else{ s->first_field ^= 1; + s->v_edge_pos= 8*s->mb_height; memset(s->mbskip_table, 0, s->mb_stride*s->mb_height); }

1 0

r6781 - in trunk/libavcodec: jpeg_ls.c mjpeg.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: kostya Date: Tue Oct 24 07:01:04 2006 New Revision: 6781 Modified: trunk/libavcodec/jpeg_ls.c trunk/libavcodec/mjpeg.c Log: JPEG-LS 16-bit gray support Modified: trunk/libavcodec/jpeg_ls.c ============================================================================== --- trunk/libavcodec/jpeg_ls.c (original) +++ trunk/libavcodec/jpeg_ls.c Tue Oct 24 07:01:04 2006 @@ -401,11 +401,126 @@ } } +/** + * 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; + x += stride; + } + } +} + static int ls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv){ int i, t = 0; uint8_t *zero, *last, *cur; JLSState *state; - int off, stride, width; + int off = 0, stride = 1, width, shift; zero = av_mallocz(s->picture.linesize[0]); last = zero; @@ -423,6 +538,11 @@ reset_ls_coding_parameters(state, 0); ls_init_state(state); + if(s->bits <= 8) + shift = point_transform + (8 - s->bits); + else + shift = point_transform + (16 - s->bits); + // av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",s->width,s->height,state->near,state->maxval,state->T1,state->T2,state->T3,state->reset,state->limit,state->qbpp, state->range); // av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n", ilv, point_transform, s->bits, s->cur_scan); if(ilv == 0) { /* separate planes */ @@ -431,8 +551,13 @@ width = s->width * stride; cur += off; for(i = 0; i < s->height; i++) { - ls_decode_line(state, s, last, cur, t, width, stride, off); - t = last[0]; + if(s->bits <= 8){ + ls_decode_line(state, s, last, cur, t, width, stride, off); + t = last[0]; + }else{ + ls_decode_line_16bpp(state, s, last, cur, t, width, stride, off); + t = *((uint16_t*)last); + } last = cur; cur += s->picture.linesize[0]; @@ -466,6 +591,31 @@ return -1; } + if(shift){ /* we need to do point transform or normalize samples */ + int x, w; + + w = s->width * s->nb_components; + + if(s->bits <= 8){ + uint8_t *src = s->picture.data[0]; + + for(i = 0; i < s->height; i++){ + for(x = off; x < w; x+= stride){ + src[x] <<= shift; + } + src += s->picture.linesize[0]; + } + }else{ + uint16_t *src = s->picture.data[0]; + + for(i = 0; i < s->height; i++){ + for(x = 0; x < w; x++){ + src[x] <<= shift; + } + src += s->picture.linesize[0]/2; + } + } + } av_free(state); av_free(zero); @@ -676,11 +826,110 @@ } } +/** + * 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){ + 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; + } + } +} + static void ls_store_lse(JLSState *state, PutBitContext *pb){ /* Test if we have default params and don't need to store LSE */ JLSState state2; memset(&state2, 0, sizeof(JLSState)); - state2.bpp = 8; + state2.bpp = state->bpp; state2.near = state->near; reset_ls_coding_parameters(&state2, 1); if(state->T1 == state2.T1 && state->T2 == state2.T2 && state->T3 == state2.T3 && state->reset == state2.reset) @@ -717,13 +966,16 @@ p->pict_type= FF_I_TYPE; p->key_frame= 1; - comps = (avctx->pix_fmt == PIX_FMT_GRAY8) ? 1 : 3; + if(avctx->pix_fmt == PIX_FMT_GRAY8 || avctx->pix_fmt == PIX_FMT_GRAY16) + comps = 1; + else + comps = 3; /* write our own JPEG header, can't use mjpeg_picture_header */ put_marker(&pb, SOI); put_marker(&pb, SOF48); put_bits(&pb, 16, 8 + comps * 3); // header size depends on components - put_bits(&pb, 8, 8); // bpp + put_bits(&pb, 8, (avctx->pix_fmt == PIX_FMT_GRAY16) ? 16 : 8); // bpp put_bits(&pb, 16, avctx->height); put_bits(&pb, 16, avctx->width); put_bits(&pb, 8, comps); // components @@ -747,7 +999,7 @@ state = av_mallocz(sizeof(JLSState)); /* initialize JPEG-LS state from JPEG parameters */ state->near = near; - state->bpp = 8; + state->bpp = (avctx->pix_fmt == PIX_FMT_GRAY16) ? 16 : 8; reset_ls_coding_parameters(state, 0); ls_init_state(state); @@ -765,6 +1017,15 @@ last = cur; cur += p->linesize[0]; } + }else if(avctx->pix_fmt == PIX_FMT_GRAY16){ + int t = 0; + + for(i = 0; i < avctx->height; i++) { + ls_encode_line_16bpp(state, &pb2, last, cur, t, avctx->width, 1, 0); + t = *((uint16_t*)last); + last = cur; + cur += p->linesize[0]; + } }else if(avctx->pix_fmt == PIX_FMT_RGB24){ int j, width; int Rc[3] = {0, 0, 0}; @@ -827,7 +1088,7 @@ c->avctx = ctx; ctx->coded_frame = &c->picture; - if(ctx->pix_fmt != PIX_FMT_GRAY8 && ctx->pix_fmt != PIX_FMT_RGB24 && ctx->pix_fmt != PIX_FMT_BGR24){ + if(ctx->pix_fmt != PIX_FMT_GRAY8 && ctx->pix_fmt != PIX_FMT_GRAY16 && ctx->pix_fmt != PIX_FMT_RGB24 && ctx->pix_fmt != PIX_FMT_BGR24){ av_log(ctx, AV_LOG_ERROR, "Only grayscale and RGB24/BGR24 images are supported\n"); return -1; } @@ -842,6 +1103,6 @@ encode_init_ls, encode_picture_ls, NULL, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, -1}, + .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, -1}, }; #endif Modified: trunk/libavcodec/mjpeg.c ============================================================================== --- trunk/libavcodec/mjpeg.c (original) +++ trunk/libavcodec/mjpeg.c Tue Oct 24 07:01:04 2006 @@ -1125,10 +1125,6 @@ av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n"); return -1; } - if (s->bits > 8 && s->ls){ - av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component accepted for JPEG-LS\n"); - return -1; - } height = get_bits(&s->gb, 16); width = get_bits(&s->gb, 16); @@ -1141,6 +1137,10 @@ if (nb_components <= 0 || nb_components > MAX_COMPONENTS) return -1; + if (s->ls && !(s->bits <= 8 || nb_components == 1)){ + av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component or 16-bit gray accepted for JPEG-LS\n"); + return -1; + } s->nb_components = nb_components; s->h_max = 1; s->v_max = 1; @@ -1223,8 +1223,10 @@ if(s->ls){ if(s->nb_components > 1) s->avctx->pix_fmt = PIX_FMT_RGB24; - else + else if(s->bits <= 8) s->avctx->pix_fmt = PIX_FMT_GRAY8; + else + s->avctx->pix_fmt = PIX_FMT_GRAY16; } if(s->picture.data[0])

1 0

r6780 - trunk/libavcodec/pnm.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: kostya Date: Tue Oct 24 07:00:14 2006 New Revision: 6780 Modified: trunk/libavcodec/pnm.c Log: PGM 16-bit gray support Modified: trunk/libavcodec/pnm.c ============================================================================== --- trunk/libavcodec/pnm.c (original) +++ trunk/libavcodec/pnm.c Tue Oct 24 07:00:14 2006 @@ -70,7 +70,7 @@ static int pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){ char buf1[32], tuple_type[32]; - int h, w, depth, maxval;; + int h, w, depth, maxval; pnm_get(s, buf1, sizeof(buf1)); if (!strcmp(buf1, "P4")) { @@ -142,8 +142,9 @@ return -1; if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { pnm_get(s, buf1, sizeof(buf1)); + if(atoi(buf1) == 65535 && avctx->pix_fmt == PIX_FMT_GRAY8) + avctx->pix_fmt = PIX_FMT_GRAY16BE; } - /* more check if YUV420 */ if (avctx->pix_fmt == PIX_FMT_YUV420P) { if ((avctx->width & 1) != 0) @@ -194,6 +195,9 @@ case PIX_FMT_GRAY8: n = avctx->width; goto do_read; + case PIX_FMT_GRAY16BE: + n = avctx->width * 2; + goto do_read; case PIX_FMT_MONOWHITE: case PIX_FMT_MONOBLACK: n = (avctx->width + 7) >> 3; @@ -292,6 +296,10 @@ c = '5'; n = avctx->width; break; + case PIX_FMT_GRAY16BE: + c = '5'; + n = avctx->width * 2; + break; case PIX_FMT_RGB24: c = '6'; n = avctx->width * 3; @@ -310,7 +318,7 @@ s->bytestream += strlen(s->bytestream); if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { snprintf(s->bytestream, s->bytestream_end - s->bytestream, - "%d\n", 255); + "%d\n", (avctx->pix_fmt != PIX_FMT_GRAY16BE) ? 255 : 65535); s->bytestream += strlen(s->bytestream); } @@ -537,7 +545,7 @@ pnm_encode_frame, NULL, //encode_end, pnm_decode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, -1}, + .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, -1}, }; #endif // CONFIG_PGM_ENCODER

1 0

r6779 - trunk/libavcodec/png.c
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: kostya Date: Tue Oct 24 06:59:46 2006 New Revision: 6779 Modified: trunk/libavcodec/png.c Log: PNG 16-bit gray decoding support Modified: trunk/libavcodec/png.c ============================================================================== --- trunk/libavcodec/png.c (original) +++ trunk/libavcodec/png.c Tue Oct 24 06:59:46 2006 @@ -567,6 +567,9 @@ } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_GRAY) { avctx->pix_fmt = PIX_FMT_GRAY8; + } else if (s->bit_depth == 16 && + s->color_type == PNG_COLOR_TYPE_GRAY) { + avctx->pix_fmt = PIX_FMT_GRAY16BE; } else if (s->bit_depth == 1 && s->color_type == PNG_COLOR_TYPE_GRAY) { avctx->pix_fmt = PIX_FMT_MONOBLACK;

1 0

r6778 - in trunk: libavcodec/imgconvert.c libavcodec/utils.c libavutil/avutil.h
by subversion＠mplayerhq.hu 24 Oct '06

24 Oct '06

Author: kostya Date: Tue Oct 24 06:57:43 2006 New Revision: 6778 Modified: trunk/libavcodec/imgconvert.c trunk/libavcodec/utils.c trunk/libavutil/avutil.h Log: 16-bit grayscale support Modified: trunk/libavcodec/imgconvert.c ============================================================================== --- trunk/libavcodec/imgconvert.c (original) +++ trunk/libavcodec/imgconvert.c Tue Oct 24 06:57:43 2006 @@ -193,6 +193,20 @@ }, /* gray / mono formats */ + [PIX_FMT_GRAY16BE] = { + .name = "gray16be", + .nb_channels = 1, + .color_type = FF_COLOR_GRAY, + .pixel_type = FF_PIXEL_PLANAR, + .depth = 16, + }, + [PIX_FMT_GRAY16LE] = { + .name = "gray16le", + .nb_channels = 1, + .color_type = FF_COLOR_GRAY, + .pixel_type = FF_PIXEL_PLANAR, + .depth = 16, + }, [PIX_FMT_GRAY8] = { .name = "gray", .nb_channels = 1, @@ -427,6 +441,8 @@ picture->data[2] = NULL; picture->linesize[0] = width * 4; return size * 4; + case PIX_FMT_GRAY16BE: + case PIX_FMT_GRAY16LE: case PIX_FMT_BGR555: case PIX_FMT_BGR565: case PIX_FMT_RGB555: @@ -1842,6 +1858,75 @@ gray_to_mono(dst, src, width, height, 0x00); } +static void gray_to_gray16(AVPicture *dst, const AVPicture *src, + int width, int height) +{ + int x, y, src_wrap, dst_wrap; + uint8_t *s, *d; + s = src->data[0]; + src_wrap = src->linesize[0] - width; + d = dst->data[0]; + dst_wrap = dst->linesize[0] - width * 2; + for(y=0; y<height; y++){ + for(x=0; x<width; x++){ + *d++ = *s; + *d++ = *s++; + } + s += src_wrap; + d += dst_wrap; + } +} + +static void gray16_to_gray(AVPicture *dst, const AVPicture *src, + int width, int height) +{ + int x, y, src_wrap, dst_wrap; + uint8_t *s, *d; + s = src->data[0]; + src_wrap = src->linesize[0] - width * 2; + d = dst->data[0]; + dst_wrap = dst->linesize[0] - width; + for(y=0; y<height; y++){ + for(x=0; x<width; x++){ + *d++ = *s; + s += 2; + } + s += src_wrap; + d += dst_wrap; + } +} + +static void gray16be_to_gray(AVPicture *dst, const AVPicture *src, + int width, int height) +{ + gray16_to_gray(dst, src, width, height); +} + +static void gray16le_to_gray(AVPicture *dst, const AVPicture *src, + int width, int height) +{ + gray16_to_gray(dst, src + 1, width, height); +} + +static void gray16_to_gray16(AVPicture *dst, const AVPicture *src, + int width, int height) +{ + int x, y, src_wrap, dst_wrap; + uint16_t *s, *d; + s = src->data[0]; + src_wrap = (src->linesize[0] - width * 2)/2; + d = dst->data[0]; + dst_wrap = (dst->linesize[0] - width * 2)/2; + for(y=0; y<height; y++){ + for(x=0; x<width; x++){ + *d++ = bswap_16(*s++); + } + s += src_wrap; + d += dst_wrap; + } +} + + typedef struct ConvertEntry { void (*convert)(AVPicture *dst, const AVPicture *src, int width, int height); @@ -2024,6 +2109,22 @@ .convert = rgb565_to_gray }, }, + [PIX_FMT_GRAY16BE] = { + [PIX_FMT_GRAY8] = { + .convert = gray16be_to_gray + }, + [PIX_FMT_GRAY16LE] = { + .convert = gray16_to_gray16 + }, + }, + [PIX_FMT_GRAY16LE] = { + [PIX_FMT_GRAY8] = { + .convert = gray16le_to_gray + }, + [PIX_FMT_GRAY16BE] = { + .convert = gray16_to_gray16 + }, + }, [PIX_FMT_GRAY8] = { [PIX_FMT_RGB555] = { .convert = gray_to_rgb555 @@ -2046,6 +2147,12 @@ [PIX_FMT_MONOBLACK] = { .convert = gray_to_monoblack }, + [PIX_FMT_GRAY16LE] = { + .convert = gray_to_gray16 + }, + [PIX_FMT_GRAY16BE] = { + .convert = gray_to_gray16 + }, }, [PIX_FMT_MONOWHITE] = { [PIX_FMT_GRAY8] = { Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c (original) +++ trunk/libavcodec/utils.c Tue Oct 24 06:57:43 2006 @@ -177,6 +177,8 @@ case PIX_FMT_YUV422P: case PIX_FMT_YUV444P: case PIX_FMT_GRAY8: + case PIX_FMT_GRAY16BE: + case PIX_FMT_GRAY16LE: case PIX_FMT_YUVJ420P: case PIX_FMT_YUVJ422P: case PIX_FMT_YUVJ444P: Modified: trunk/libavutil/avutil.h ============================================================================== --- trunk/libavutil/avutil.h (original) +++ trunk/libavutil/avutil.h Tue Oct 24 06:57:43 2006 @@ -34,8 +34,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVUTIL_VERSION_INT ((49<<16)+(0<<8)+1) -#define LIBAVUTIL_VERSION 49.0.1 +#define LIBAVUTIL_VERSION_INT ((49<<16)+(0<<8)+2) +#define LIBAVUTIL_VERSION 49.0.2 #define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) @@ -105,6 +105,8 @@ PIX_FMT_RGB32_1, ///< Packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in cpu endianness PIX_FMT_BGR32_1, ///< Packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in cpu endianness + PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian + PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; @@ -113,11 +115,13 @@ #define PIX_FMT_BGRA PIX_FMT_BGR32_1 #define PIX_FMT_ARGB PIX_FMT_RGB32 #define PIX_FMT_ABGR PIX_FMT_BGR32 +#define PIX_FMT_GRAY16 PIX_FMT_GRAY16BE #else #define PIX_FMT_RGBA PIX_FMT_BGR32 #define PIX_FMT_BGRA PIX_FMT_RGB32 #define PIX_FMT_ARGB PIX_FMT_BGR32_1 #define PIX_FMT_ABGR PIX_FMT_RGB32_1 +#define PIX_FMT_GRAY16 PIX_FMT_GRAY16LE #endif #if LIBAVUTIL_VERSION_INT < (50<<16)

1 0

r6777 - in trunk: Makefile libavcodec/Makefile libavcodec/imgresample.c libavcodec/swscale.h vhook/Makefile
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: lucabe Date: Mon Oct 23 19:06:32 2006 New Revision: 6777 Removed: trunk/libavcodec/swscale.h Modified: trunk/Makefile trunk/libavcodec/Makefile trunk/libavcodec/imgresample.c trunk/vhook/Makefile Log: Do not use a fake libavcodec/swscale.h, but always use the real one (from libswscale) instead Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Oct 23 19:06:32 2006 @@ -7,14 +7,10 @@ VPATH=$(SRC_PATH) CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ - -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \ + -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE LDFLAGS+= -g -ifeq ($(CONFIG_SWSCALER),yes) -CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS) -endif - MANPAGES=doc/ffmpeg.1 PROGS_G+=ffmpeg_g$(EXESUF) PROGS+=ffmpeg$(EXESUF) @@ -166,9 +162,7 @@ ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc install-headers endif -ifeq ($(CONFIG_SWSCALER),yes) $(MAKE) -C libswscale install-headers -endif uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Mon Oct 23 19:06:32 2006 @@ -4,7 +4,7 @@ # include ../config.mak -CFLAGS+=$(AMR_CFLAGS) +CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS) OBJS= bitstream.o \ utils.o \ @@ -45,9 +45,6 @@ HEADERS = avcodec.h opt.h -ifneq ($(CONFIG_SWSCALER),yes) -HEADERS += swscale.h -endif OBJS-$(CONFIG_AASC_DECODER) += aasc.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o Modified: trunk/libavcodec/imgresample.c ============================================================================== --- trunk/libavcodec/imgresample.c (original) +++ trunk/libavcodec/imgresample.c Mon Oct 23 19:06:32 2006 @@ -47,6 +47,11 @@ #define LINE_BUF_HEIGHT (NB_TAPS * 4) +struct SwsContext { + struct ImgReSampleContext *resampling_ctx; + enum PixelFormat src_pix_fmt, dst_pix_fmt; +}; + struct ImgReSampleContext { int iwidth, iheight, owidth, oheight; int topBand, bottomBand, leftBand, rightBand; Modified: trunk/vhook/Makefile ============================================================================== --- trunk/vhook/Makefile (original) +++ trunk/vhook/Makefile Mon Oct 23 19:06:32 2006 @@ -3,13 +3,9 @@ VPATH=$(SRC_PATH)/vhook CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ - -I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H + -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H LDFLAGS+= -g -ifeq ($(CONFIG_SWSCALER),yes) -CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS) -endif - HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)

1 0

r6776 - trunk/libavcodec/cabac.h
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: reimar Date: Mon Oct 23 18:54:21 2006 New Revision: 6776 Modified: trunk/libavcodec/cabac.h Log: CABAC assembler optimizations ported to AMD64 Modified: trunk/libavcodec/cabac.h ============================================================================== --- trunk/libavcodec/cabac.h (original) +++ trunk/libavcodec/cabac.h Mon Oct 23 18:54:21 2006 @@ -28,6 +28,12 @@ //#undef NDEBUG #include <assert.h> +#ifdef ARCH_X86_64 +#define ARCH_X86 +#endif +#ifdef ARCH_X86 +#include "x86_cpu.h" +#endif #define CABAC_BITS 16 #define CABAC_MASK ((1<<CABAC_BITS)-1) @@ -364,9 +370,15 @@ //FIXME gcc generates duplicate load/stores for c->low and c->range #define LOW "0" #define RANGE "4" +#ifdef ARCH_X86_64 +#define BYTESTART "16" +#define BYTE "24" +#define BYTEEND "32" +#else #define BYTESTART "12" #define BYTE "16" #define BYTEEND "20" +#endif #if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) int bit; @@ -403,14 +415,14 @@ //eax:state ebx:low, edx:range, esi:RangeLPS "test %%bx, %%bx \n\t" " jnz 2f \n\t" - "movl "BYTE "(%2), %%esi \n\t" + "mov "BYTE "(%2), %%"REG_S" \n\t" "subl $0xFFFF, %%ebx \n\t" - "movzwl (%%esi), %%ecx \n\t" + "movzwl (%%"REG_S"), %%ecx \n\t" "bswap %%ecx \n\t" "shrl $15, %%ecx \n\t" - "addl $2, %%esi \n\t" + "add $2, %%"REG_S" \n\t" "addl %%ecx, %%ebx \n\t" - "movl %%esi, "BYTE "(%2) \n\t" + "mov %%"REG_S", "BYTE "(%2) \n\t" "jmp 2f \n\t" "1: \n\t" //eax:state ebx:low, edx:range, esi:RangeLPS @@ -421,17 +433,17 @@ "shll %%cl, %%edx \n\t" "movzbl "MANGLE(ff_h264_lps_state)"(%0), %%ecx \n\t" "movb %%cl, (%1) \n\t" - "addl $1, %0 \n\t" + "add $1, %0 \n\t" "test %%bx, %%bx \n\t" " jnz 2f \n\t" - "movl "BYTE "(%2), %%ecx \n\t" - "movzwl (%%ecx), %%esi \n\t" + "mov "BYTE "(%2), %%"REG_c" \n\t" + "movzwl (%%"REG_c"), %%esi \n\t" "bswap %%esi \n\t" "shrl $15, %%esi \n\t" "subl $0xFFFF, %%esi \n\t" - "addl $2, %%ecx \n\t" - "movl %%ecx, "BYTE "(%2) \n\t" + "add $2, %%"REG_c" \n\t" + "mov %%"REG_c", "BYTE "(%2) \n\t" "leal -1(%%ebx), %%ecx \n\t" "xorl %%ebx, %%ecx \n\t" @@ -447,7 +459,7 @@ "movl %%ebx, "LOW "(%2) \n\t" :"=&a"(bit) //FIXME this is fragile gcc either runs out of registers or misscompiles it (for example if "+a"(bit) or "+m"(*state) is used :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" + : "%"REG_c, "%ebx", "%edx", "%"REG_S, "memory" ); bit&=1; #else /* BRANCHLESS_CABAC_DECODER */ @@ -493,13 +505,13 @@ "shl %%cl , "low" \n\t"\ "test "lowword" , "lowword" \n\t"\ " jnz 1f \n\t"\ - "mov "BYTE"("cabac"), %%ecx \n\t"\ - "movzwl (%%ecx) , "tmp" \n\t"\ + "mov "BYTE"("cabac"), %%"REG_c" \n\t"\ + "movzwl (%%"REG_c") , "tmp" \n\t"\ "bswap "tmp" \n\t"\ "shr $15 , "tmp" \n\t"\ "sub $0xFFFF , "tmp" \n\t"\ - "add $2 , %%ecx \n\t"\ - "mov %%ecx , "BYTE "("cabac") \n\t"\ + "add $2 , %%"REG_c" \n\t"\ + "mov %%"REG_c" , "BYTE "("cabac") \n\t"\ "lea -1("low") , %%ecx \n\t"\ "xor "low" , %%ecx \n\t"\ "shr $15 , %%ecx \n\t"\ @@ -519,7 +531,7 @@ :"=&a"(bit) :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" + : "%"REG_c, "%ebx", "%edx", "%esi", "memory" ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ @@ -588,20 +600,20 @@ "add %%ebx, %%eax \n\t" "test %%ax, %%ax \n\t" " jnz 1f \n\t" - "movl "BYTE "(%1), %%ebx \n\t" + "movl "BYTE "(%1), %%"REG_b" \n\t" "subl $0xFFFF, %%eax \n\t" - "movzwl (%%ebx), %%ecx \n\t" + "movzwl (%%"REG_b"), %%ecx \n\t" "bswap %%ecx \n\t" "shrl $15, %%ecx \n\t" - "addl $2, %%ebx \n\t" + "addl $2, %%"REG_b" \n\t" "addl %%ecx, %%eax \n\t" - "movl %%ebx, "BYTE "(%1) \n\t" + "movl %%"REG_b", "BYTE "(%1) \n\t" "1: \n\t" "movl %%eax, "LOW "(%1) \n\t" :"=&d"(bit) :"r"(c) - : "%eax", "%ebx", "%ecx", "memory" + : "%eax", "%"REG_b, "%ecx", "memory" ); return bit+1; #else @@ -637,20 +649,20 @@ "sub %%edx, %%ecx \n\t" "test %%ax, %%ax \n\t" " jnz 1f \n\t" - "movl "BYTE "(%1), %%ebx \n\t" + "mov "BYTE "(%1), %%"REG_b" \n\t" "subl $0xFFFF, %%eax \n\t" - "movzwl (%%ebx), %%edx \n\t" + "movzwl (%%"REG_b"), %%edx \n\t" "bswap %%edx \n\t" "shrl $15, %%edx \n\t" - "addl $2, %%ebx \n\t" + "add $2, %%"REG_b" \n\t" "addl %%edx, %%eax \n\t" - "movl %%ebx, "BYTE "(%1) \n\t" + "mov %%"REG_b", "BYTE "(%1) \n\t" "1: \n\t" "movl %%eax, "LOW "(%1) \n\t" :"+c"(val) :"r"(c) - : "%eax", "%ebx", "%edx", "memory" + : "%eax", "%"REG_b, "%edx", "memory" ); return val; #else @@ -690,34 +702,34 @@ BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") - "movl %2, %%eax \n\t" + "mov %2, %%"REG_a" \n\t" "movl %4, %%ecx \n\t" - "addl %1, %%ecx \n\t" - "movl %%ecx, (%%eax) \n\t" + "add %1, %%"REG_c" \n\t" + "movl %%ecx, (%%"REG_a") \n\t" "test $1, %%edx \n\t" " jnz 4f \n\t" - "addl $4, %%eax \n\t" - "movl %%eax, %2 \n\t" + "add $4, %%"REG_a" \n\t" + "mov %%"REG_a", %2 \n\t" "3: \n\t" - "addl $1, %1 \n\t" - "cmpl %5, %1 \n\t" + "add $1, %1 \n\t" + "cmp %5, %1 \n\t" " jb 2b \n\t" - "movl %2, %%eax \n\t" + "mov %2, %%"REG_a" \n\t" "movl %4, %%ecx \n\t" - "addl %1, %%ecx \n\t" - "movl %%ecx, (%%eax) \n\t" + "add %1, %%"REG_c" \n\t" + "movl %%ecx, (%%"REG_a") \n\t" "4: \n\t" - "addl %6, %%eax \n\t" + "add %6, %%eax \n\t" "shr $2, %%eax \n\t" "movl %%esi, "RANGE "(%3) \n\t" "movl %%ebx, "LOW "(%3) \n\t" :"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index)\ :"r"(c), "m"(minusstart), "m"(end), "m"(minusindex)\ - : "%ecx", "%ebx", "%edx", "%esi", "memory"\ + : "%"REG_c, "%ebx", "%edx", "%esi", "memory"\ ); return coeff_count; } @@ -725,46 +737,46 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, uint8_t *sig_off){ int minusindex= 4-(int)index; int coeff_count; - int last=0; + long last=0; asm volatile( "movl "RANGE "(%3), %%esi \n\t" "movl "LOW "(%3), %%ebx \n\t" - "mov %1, %%edi \n\t" + "mov %1, %%"REG_D" \n\t" "2: \n\t" - "mov %6, %%eax \n\t" - "movzbl (%%eax, %%edi), %%edi \n\t" - "add %5, %%edi \n\t" + "mov %6, %%"REG_a" \n\t" + "movzbl (%%"REG_a", %%"REG_D"), %%edi \n\t" + "add %5, %%"REG_D" \n\t" - BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%edi)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") + BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") "mov %1, %%edi \n\t" "test $1, %%edx \n\t" " jz 3f \n\t" "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t" - "add %5, %%edi \n\t" + "add %5, %%"REG_D" \n\t" - BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%edi)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") + BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") - "movl %2, %%eax \n\t" + "mov %2, %%"REG_a" \n\t" "mov %1, %%edi \n\t" - "movl %%edi, (%%eax) \n\t" + "movl %%edi, (%%"REG_a") \n\t" "test $1, %%edx \n\t" " jnz 4f \n\t" - "addl $4, %%eax \n\t" - "movl %%eax, %2 \n\t" + "add $4, %%"REG_a" \n\t" + "mov %%"REG_a", %2 \n\t" "3: \n\t" "addl $1, %%edi \n\t" "mov %%edi, %1 \n\t" "cmpl $63, %%edi \n\t" " jb 2b \n\t" - "movl %2, %%eax \n\t" - "movl %%edi, (%%eax) \n\t" + "mov %2, %%"REG_a" \n\t" + "movl %%edi, (%%"REG_a") \n\t" "4: \n\t" "addl %4, %%eax \n\t" "shr $2, %%eax \n\t" @@ -773,7 +785,7 @@ "movl %%ebx, "LOW "(%3) \n\t" :"=&a"(coeff_count),"+m"(last), "+m"(index)\ :"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off)\ - : "%ecx", "%ebx", "%edx", "%esi", "%edi", "memory"\ + : "%"REG_c, "%ebx", "%edx", "%esi", "%"REG_D, "memory"\ ); return coeff_count; }

1 0

r6772 - in trunk: libavcodec/vp6.c libavformat/flvdec.c
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: aurel Date: Mon Oct 23 02:10:18 2006 New Revision: 6772 Modified: trunk/libavcodec/vp6.c trunk/libavformat/flvdec.c Log: document the extradata protocol for VP6F Modified: trunk/libavcodec/vp6.c ============================================================================== --- trunk/libavcodec/vp6.c (original) +++ trunk/libavcodec/vp6.c Mon Oct 23 02:10:18 2006 @@ -19,6 +19,11 @@ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * + * The VP6F decoder accept an optional 1 byte extradata. It is composed of: + * - upper 4bits: difference between encoded width and visible width + * - lower 4bits: difference between encoded height and visible height */ #include <stdlib.h> Modified: trunk/libavformat/flvdec.c ============================================================================== --- trunk/libavformat/flvdec.c (original) +++ trunk/libavformat/flvdec.c Mon Oct 23 02:10:18 2006 @@ -17,6 +17,12 @@ * 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 + * + * + * This demuxer will generate a 1 byte extradata for VP6F content. + * It is composed of: + * - upper 4bits: difference between encoded width and visible width + * - lower 4bits: difference between encoded height and visible height */ #include "avformat.h"

4 3

r6775 - trunk/libavformat/img2.c
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: kostya Date: Mon Oct 23 15:17:46 2006 New Revision: 6775 Modified: trunk/libavformat/img2.c Log: Register .tga and .tiff image extensions Modified: trunk/libavformat/img2.c ============================================================================== --- trunk/libavformat/img2.c (original) +++ trunk/libavformat/img2.c Mon Oct 23 15:17:46 2006 @@ -52,6 +52,8 @@ { CODEC_ID_RAWVIDEO , "y"}, { CODEC_ID_BMP , "bmp"}, { CODEC_ID_GIF , "gif"}, + { CODEC_ID_TARGA , "tga"}, + { CODEC_ID_TIFF , "tiff"}, {0, NULL} };

1 0

r6773 - trunk/libavformat/flvdec.c
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: aurel Date: Mon Oct 23 02:13:02 2006 New Revision: 6773 Modified: trunk/libavformat/flvdec.c Log: fix flvdec.c file description comment Modified: trunk/libavformat/flvdec.c ============================================================================== --- trunk/libavformat/flvdec.c (original) +++ trunk/libavformat/flvdec.c Mon Oct 23 02:13:02 2006 @@ -1,5 +1,5 @@ /* - * FLV encoder. + * FLV decoder. * Copyright (c) 2003 The FFmpeg Project. * * This file is part of FFmpeg.

4 4

r6774 - in trunk/libavformat: aiff.c asf-enc.c asf.c au.c avidec.c avienc.c daud.c ffm.c flvdec.c flvenc.c gif.c gifdec.c mov.c movenc.c mp3.c mpeg.c mpegts.c mpegtsenc.c nsvdec.c raw.c rm.c smacker.c sol.c wav.c
by subversion＠mplayerhq.hu 23 Oct '06

23 Oct '06

Author: aurel Date: Mon Oct 23 10:57:54 2006 New Revision: 6774 Modified: trunk/libavformat/aiff.c trunk/libavformat/asf-enc.c trunk/libavformat/asf.c trunk/libavformat/au.c trunk/libavformat/avidec.c trunk/libavformat/avienc.c trunk/libavformat/daud.c trunk/libavformat/ffm.c trunk/libavformat/flvdec.c trunk/libavformat/flvenc.c trunk/libavformat/gif.c trunk/libavformat/gifdec.c trunk/libavformat/mov.c trunk/libavformat/movenc.c trunk/libavformat/mp3.c trunk/libavformat/mpeg.c trunk/libavformat/mpegts.c trunk/libavformat/mpegtsenc.c trunk/libavformat/nsvdec.c trunk/libavformat/raw.c trunk/libavformat/rm.c trunk/libavformat/smacker.c trunk/libavformat/sol.c trunk/libavformat/wav.c Log: replace coder/decoder file description in libavformat by muxer/demuxer Modified: trunk/libavformat/aiff.c ============================================================================== --- trunk/libavformat/aiff.c (original) +++ trunk/libavformat/aiff.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * AIFF/AIFF-C encoder and decoder + * AIFF/AIFF-C muxer and demuxer * Copyright (c) 2006 Patrick Guimond * * This file is part of FFmpeg. Modified: trunk/libavformat/asf-enc.c ============================================================================== --- trunk/libavformat/asf-enc.c (original) +++ trunk/libavformat/asf-enc.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * Adaptive stream format encoder + * Adaptive stream format muxer * Copyright (c) 2000, 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c (original) +++ trunk/libavformat/asf.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * ASF compatible decoder. + * ASF compatible demuxer * Copyright (c) 2000, 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/au.c ============================================================================== --- trunk/libavformat/au.c (original) +++ trunk/libavformat/au.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * AU encoder and decoder + * AU muxer and demuxer * Copyright (c) 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/avidec.c ============================================================================== --- trunk/libavformat/avidec.c (original) +++ trunk/libavformat/avidec.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * AVI decoder. + * AVI demuxer * Copyright (c) 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/avienc.c ============================================================================== --- trunk/libavformat/avienc.c (original) +++ trunk/libavformat/avienc.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * AVI encoder. + * AVI muxer * Copyright (c) 2000 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/daud.c ============================================================================== --- trunk/libavformat/daud.c (original) +++ trunk/libavformat/daud.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * D-Cinema audio decoder. + * D-Cinema audio demuxer * Copyright (c) 2005 Reimar D?ffinger. * * This file is part of FFmpeg. Modified: trunk/libavformat/ffm.c ============================================================================== --- trunk/libavformat/ffm.c (original) +++ trunk/libavformat/ffm.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) encoder and decoder + * FFM (ffserver live feed) muxer and demuxer * Copyright (c) 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/flvdec.c ============================================================================== --- trunk/libavformat/flvdec.c (original) +++ trunk/libavformat/flvdec.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * FLV decoder. + * FLV demuxer * Copyright (c) 2003 The FFmpeg Project. * * This file is part of FFmpeg. Modified: trunk/libavformat/flvenc.c ============================================================================== --- trunk/libavformat/flvenc.c (original) +++ trunk/libavformat/flvenc.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * FLV encoder. + * FLV muxer * Copyright (c) 2003 The FFmpeg Project. * * This file is part of FFmpeg. Modified: trunk/libavformat/gif.c ============================================================================== --- trunk/libavformat/gif.c (original) +++ trunk/libavformat/gif.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * Animated GIF encoder + * Animated GIF muxer * Copyright (c) 2000 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/gifdec.c ============================================================================== --- trunk/libavformat/gifdec.c (original) +++ trunk/libavformat/gifdec.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * GIF decoder + * GIF demuxer * Copyright (c) 2003 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MOV decoder. + * MOV demuxer * Copyright (c) 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MOV, 3GP, MP4 encoder. + * MOV, 3GP, MP4 muxer * Copyright (c) 2003 Thomas Raivio. * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org>. * Modified: trunk/libavformat/mp3.c ============================================================================== --- trunk/libavformat/mp3.c (original) +++ trunk/libavformat/mp3.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MP3 encoder and decoder + * MP3 muxer and demuxer * Copyright (c) 2003 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/mpeg.c ============================================================================== --- trunk/libavformat/mpeg.c (original) +++ trunk/libavformat/mpeg.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MPEG1/2 mux/demux + * MPEG1/2 muxer and demuxer * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/mpegts.c ============================================================================== --- trunk/libavformat/mpegts.c (original) +++ trunk/libavformat/mpegts.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MPEG2 transport stream (aka DVB) demux + * MPEG2 transport stream (aka DVB) demuxer * Copyright (c) 2002-2003 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/mpegtsenc.c ============================================================================== --- trunk/libavformat/mpegtsenc.c (original) +++ trunk/libavformat/mpegtsenc.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * MPEG2 transport stream (aka DVB) mux + * MPEG2 transport stream (aka DVB) muxer * Copyright (c) 2003 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/nsvdec.c ============================================================================== --- trunk/libavformat/nsvdec.c (original) +++ trunk/libavformat/nsvdec.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * NSV decoder. + * NSV demuxer * Copyright (c) 2004 The FFmpeg Project. * * This file is part of FFmpeg. Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * RAW encoder and decoder + * RAW muxer and demuxer * Copyright (c) 2001 Fabrice Bellard. * Copyright (c) 2005 Alex Beregszaszi * Modified: trunk/libavformat/rm.c ============================================================================== --- trunk/libavformat/rm.c (original) +++ trunk/libavformat/rm.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * "Real" compatible mux and demux. + * "Real" compatible muxer and demuxer. * Copyright (c) 2000, 2001 Fabrice Bellard. * * This file is part of FFmpeg. Modified: trunk/libavformat/smacker.c ============================================================================== --- trunk/libavformat/smacker.c (original) +++ trunk/libavformat/smacker.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * Smacker decoder + * Smacker demuxer * Copyright (c) 2006 Konstantin Shishkov. * * This file is part of FFmpeg. Modified: trunk/libavformat/sol.c ============================================================================== --- trunk/libavformat/sol.c (original) +++ trunk/libavformat/sol.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * Sierra SOL decoder + * Sierra SOL demuxer * Copyright Konstantin Shishkov. * * This file is part of FFmpeg. Modified: trunk/libavformat/wav.c ============================================================================== --- trunk/libavformat/wav.c (original) +++ trunk/libavformat/wav.c Mon Oct 23 10:57:54 2006 @@ -1,5 +1,5 @@ /* - * WAV encoder and decoder + * WAV muxer and demuxer * Copyright (c) 2001, 2002 Fabrice Bellard. * * This file is part of FFmpeg.

1 0

r6771 - trunk/libavformat/swf.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: aurel Date: Mon Oct 23 01:23:55 2006 New Revision: 6771 Modified: trunk/libavformat/swf.c Log: don't use ast before checking it's not NULL Modified: trunk/libavformat/swf.c ============================================================================== --- trunk/libavformat/swf.c (original) +++ trunk/libavformat/swf.c Mon Oct 23 01:23:55 2006 @@ -829,9 +829,9 @@ get_le16(pb); } ast = av_new_stream(s, 1); - av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */ if (!ast) return -ENOMEM; + av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */ if (v & 0x01) ast->codec->channels = 2;

1 0

r6769 - trunk/libavcodec/vp56.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: aurel Date: Sun Oct 22 20:33:09 2006 New Revision: 6769 Modified: trunk/libavcodec/vp56.c Log: use coded_width and coded_height instead of width and height Modified: trunk/libavcodec/vp56.c ============================================================================== --- trunk/libavcodec/vp56.c (original) +++ trunk/libavcodec/vp56.c Sun Oct 22 20:33:09 2006 @@ -462,16 +462,16 @@ int stride = s->frames[VP56_FRAME_CURRENT].linesize[0]; int i; - s->plane_width[0] = s->avctx->width; - s->plane_width[1] = s->plane_width[2] = s->avctx->width/2; - s->plane_height[0] = s->avctx->height; - s->plane_height[1] = s->plane_height[2] = s->avctx->height/2; + s->plane_width[0] = s->avctx->coded_width; + s->plane_width[1] = s->plane_width[2] = s->avctx->coded_width/2; + s->plane_height[0] = s->avctx->coded_height; + s->plane_height[1] = s->plane_height[2] = s->avctx->coded_height/2; for (i=0; i<3; i++) s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT].linesize[i]; - s->mb_width = (s->avctx->width+15) / 16; - s->mb_height = (s->avctx->height+15) / 16; + s->mb_width = (s->avctx->coded_width+15) / 16; + s->mb_height = (s->avctx->coded_height+15) / 16; if (s->mb_width > 1000 || s->mb_height > 1000) { av_log(avctx, AV_LOG_ERROR, "picture too big\n");

1 0

r6768 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 19:25:16 2006 New Revision: 6768 Modified: trunk/libavcodec/gifdec.c Log: indention Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 19:25:16 2006 @@ -251,19 +251,19 @@ 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; + 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); @@ -276,7 +276,7 @@ pass = 0; y1 = 0; for (y = 0; y < height; y++) { - GLZWDecode(s, ptr, width); + GLZWDecode(s, ptr, width); if (is_interleaved) { switch(pass) { default:

1 0

r6767 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 18:17:02 2006 New Revision: 6767 Modified: trunk/libavformat/mov.c Log: activate gif decoder, seems to work fine on showdown2.mov Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Sun Oct 22 18:17:02 2006 @@ -81,7 +81,7 @@ { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */ /* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */ -/* { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, *//* embedded gif files as frames (usually one "click to play movie" frame) */ + { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */ /* Sorenson video */ { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */ { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */

1 0

r6766 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 18:12:13 2006 New Revision: 6766 Modified: trunk/libavcodec/gifdec.c Log: removed useless variables Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 18:12:13 2006 @@ -41,9 +41,7 @@ int background_color_index; int transparent_color_index; int color_resolution; - int image_linesize; uint32_t *image_palette; - int pix_fmt; /* after the frame is displayed, the disposal method is used */ int gce_disposal; @@ -460,11 +458,6 @@ if (gif_read_header1(s) < 0) return -1; - /* allocate image buffer */ - s->image_linesize = s->screen_width * 3; - s->pix_fmt = PIX_FMT_PAL8; - /* now we are ready: build format streams */ - avctx->pix_fmt = PIX_FMT_PAL8; if (avcodec_check_dimensions(avctx, s->screen_width, s->screen_height)) return -1;

1 0

r6765 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 18:10:04 2006 New Revision: 6765 Modified: trunk/libavcodec/gifdec.c Log: use avctx->get_buffer Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 18:10:04 2006 @@ -34,15 +34,15 @@ #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; - uint8_t *image_buf; int image_linesize; - uint32_t image_palette[256]; + uint32_t *image_palette; int pix_fmt; /* after the frame is displayed, the disposal method is used */ @@ -272,8 +272,8 @@ GLZWDecodeInit(s, code_size); /* read all the image */ - linesize = s->image_linesize; - ptr1 = s->image_buf + top * linesize + (left * 3); + linesize = s->picture.linesize[0]; + ptr1 = s->picture.data[0] + top * linesize + (left * 3); ptr = ptr1; pass = 0; y1 = 0; @@ -444,6 +444,9 @@ { GifState *s = avctx->priv_data; + avcodec_get_frame_defaults(&s->picture); + avctx->coded_frame= &s->picture; + s->picture.data[0] = NULL; return 0; } @@ -459,30 +462,39 @@ /* allocate image buffer */ s->image_linesize = s->screen_width * 3; - s->image_buf = av_malloc(s->screen_height * s->image_linesize); - if (!s->image_buf) - return -ENOMEM; s->pix_fmt = PIX_FMT_PAL8; /* now we are ready: build format streams */ - /* XXX: check if screen size is always valid */ - avctx->width = s->screen_width; - avctx->height = s->screen_height; 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->data[0] = s->image_buf; - picture->linesize[0] = s->image_linesize; - picture->data[1] = s->image_palette; - picture->linesize[1] = 4; - + *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, @@ -490,6 +502,6 @@ sizeof(GifState), gif_decode_init, NULL, - NULL, + gif_decode_close, gif_decode_frame, };

1 0

r6764 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 17:15:15 2006 New Revision: 6764 Modified: trunk/libavcodec/gifdec.c Log: remove unused variables Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 17:15:15 2006 @@ -224,8 +224,8 @@ 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, x, pass, y1, linesize, n, i; - uint8_t *ptr, *line, *d, *spal, *palette, *sptr, *ptr1; + 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); @@ -369,7 +369,7 @@ static int gif_read_header1(GifState *s) { uint8_t sig[6]; - int ret, v, n; + int v, n; int has_global_palette; /* read gif signature */

1 0

r6763 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 17:11:51 2006 New Revision: 6763 Modified: trunk/libavcodec/gifdec.c Log: printf -> dprintf Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 17:11:51 2006 @@ -236,7 +236,7 @@ has_local_palette = flags & 0x80; bits_per_pixel = (flags & 0x07) + 1; #ifdef DEBUG - printf("gif: image x=%d y=%d w=%d h=%d\n", left, top, width, height); + dprintf("gif: image x=%d y=%d w=%d h=%d\n", left, top, width, height); #endif if (has_local_palette) { @@ -329,7 +329,7 @@ ext_code = bytestream_get_byte(&s->bytestream); ext_len = bytestream_get_byte(&s->bytestream); #ifdef DEBUG - printf("gif: ext_code=0x%x len=%d\n", ext_code, ext_len); + dprintf("gif: ext_code=0x%x len=%d\n", ext_code, ext_len); #endif switch(ext_code) { case 0xf9: @@ -345,7 +345,7 @@ s->transparent_color_index = -1; s->gce_disposal = (gce_flags >> 2) & 0x7; #ifdef DEBUG - printf("gif: gce_flags=%x delay=%d tcolor=%d disposal=%d\n", + 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 @@ -360,7 +360,7 @@ bytestream_get_byte(&s->bytestream); ext_len = bytestream_get_byte(&s->bytestream); #ifdef DEBUG - printf("gif: ext_len1=%d\n", ext_len); + dprintf("gif: ext_len1=%d\n", ext_len); #endif } return 0; @@ -395,7 +395,7 @@ s->background_color_index = bytestream_get_byte(&s->bytestream); bytestream_get_byte(&s->bytestream); /* ignored */ #ifdef DEBUG - printf("gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", + 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 @@ -413,7 +413,7 @@ for (;;) { code = bytestream_get_byte(&s->bytestream); #ifdef DEBUG - printf("gif: code=%02x '%c'\n", code, code); + dprintf("gif: code=%02x '%c'\n", code, code); #endif switch (code) { case ',':

1 0

r6762 - trunk/libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 17:09:32 2006 New Revision: 6762 Modified: trunk/libavcodec/gifdec.c Log: indention Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 17:09:32 2006 @@ -26,7 +26,7 @@ #include "bytestream.h" #define MAXBITS 12 -#define SIZTABLE (1<<MAXBITS) +#define SIZTABLE (1<<MAXBITS) #define GCE_DISPOSAL_NONE 0 #define GCE_DISPOSAL_INPLACE 1

1 0

r6761 - trunk/libavformat/img2.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 17:07:25 2006 New Revision: 6761 Modified: trunk/libavformat/img2.c Log: add gif support Modified: trunk/libavformat/img2.c ============================================================================== --- trunk/libavformat/img2.c (original) +++ trunk/libavformat/img2.c Sun Oct 22 17:07:25 2006 @@ -51,6 +51,7 @@ { CODEC_ID_FFV1 , "ffv1-img"}, { CODEC_ID_RAWVIDEO , "y"}, { CODEC_ID_BMP , "bmp"}, + { CODEC_ID_GIF , "gif"}, {0, NULL} };

1 0

r6760 - in trunk: Changelog MAINTAINERS libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/bytestream.h libavcodec/gifdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 17:05:03 2006 New Revision: 6760 Added: trunk/libavcodec/bytestream.h trunk/libavcodec/gifdec.c - copied, changed from r6758, /trunk/libavformat/gifdec.c Modified: trunk/Changelog trunk/MAINTAINERS trunk/libavcodec/Makefile trunk/libavcodec/allcodecs.c trunk/libavcodec/avcodec.h Log: change gif demuxer to gif decoder Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Sun Oct 22 17:05:03 2006 @@ -64,6 +64,7 @@ - Tiertex .seq demuxer/video decoder - MTV demuxer - TIFF picture decoder +- GIF picture decoder version 0.4.9-pre1: Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS (original) +++ trunk/MAINTAINERS Sun Oct 22 17:05:03 2006 @@ -121,6 +121,7 @@ flashsv.c Benjamin Larsson flicvideo.c Mike Melanson g726.c Roman Shaposhnik + gifdec.c Baptiste Coudurier h264* Loren Merritt, Michael Niedermayer h261* Michael Niedermayer h263* Michael Niedermayer Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Sun Oct 22 17:05:03 2006 @@ -84,6 +84,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_H261_DECODER) += h261.o OBJS-$(CONFIG_H261_ENCODER) += h261.o OBJS-$(CONFIG_H264_DECODER) += h264.o Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Sun Oct 22 17:05:03 2006 @@ -193,6 +193,9 @@ #endif //CONFIG_RAWVIDEO_ENCODER /* decoders */ +#ifdef CONFIG_GIF_DECODER + register_avcodec(&gif_decoder); +#endif #ifdef CONFIG_H263_DECODER register_avcodec(&h263_decoder); #endif //CONFIG_H263_DECODER Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Sun Oct 22 17:05:03 2006 @@ -37,8 +37,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(20<<8)+0) -#define LIBAVCODEC_VERSION 51.20.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(21<<8)+0) +#define LIBAVCODEC_VERSION 51.21.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -148,6 +148,7 @@ CODEC_ID_DSICINVIDEO, CODEC_ID_TIERTEXSEQVIDEO, CODEC_ID_TIFF, + CODEC_ID_GIF, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, @@ -2177,6 +2178,7 @@ extern AVCodec svq1_encoder; extern AVCodec x264_encoder; +extern AVCodec gif_decoder; extern AVCodec h263_decoder; extern AVCodec h261_decoder; extern AVCodec mpeg4_decoder; Added: trunk/libavcodec/bytestream.h ============================================================================== --- (empty file) +++ trunk/libavcodec/bytestream.h Sun Oct 22 17:05:03 2006 @@ -0,0 +1,50 @@ +/* + * Bytestream functions + * copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier at free.fr> + * + * 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 + */ + +#ifndef FFMPEG_BYTESTREAM_H +#define FFMPEG_BYTESTREAM_H + +static always_inline unsigned int bytestream_get_le32(uint8_t **b) +{ + (*b) += 4; + return LE_32(*b - 4); +} + +static always_inline unsigned int bytestream_get_le16(uint8_t **b) +{ + (*b) += 2; + return LE_16(*b - 2); +} + +static always_inline unsigned int bytestream_get_byte(uint8_t **b) +{ + (*b)++; + return (*b)[-1]; +} + +static always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size) +{ + memcpy(dst, *b, size); + (*b) += size; + return size; +} + +#endif /* FFMPEG_BYTESTREAM_H */ Copied: trunk/libavcodec/gifdec.c (from r6758, /trunk/libavformat/gifdec.c) ============================================================================== --- /trunk/libavformat/gifdec.c (original) +++ trunk/libavcodec/gifdec.c Sun Oct 22 17:05:03 2006 @@ -1,6 +1,7 @@ /* * GIF decoder * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2006 Baptiste Coudurier. * * This file is part of FFmpeg. * @@ -18,12 +19,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avformat.h" - -int gif_write(ByteIOContext *pb, AVImageInfo *info); //#define DEBUG +#include "avcodec.h" +#include "bytestream.h" + #define MAXBITS 12 #define SIZTABLE (1<<MAXBITS) @@ -41,7 +42,7 @@ int color_resolution; uint8_t *image_buf; int image_linesize; - uint32_t *image_palette; + uint32_t image_palette[256]; int pix_fmt; /* after the frame is displayed, the disposal method is used */ @@ -50,7 +51,7 @@ int gce_delay; /* LZW compatible decoder */ - ByteIOContext *f; + uint8_t *bytestream; int eob_reached; uint8_t *pbuf, *ebuf; int bbits; @@ -76,7 +77,6 @@ uint8_t buf[256]; } GifState; - static const uint8_t gif87a_sig[6] = "GIF87a"; static const uint8_t gif89a_sig[6] = "GIF89a"; @@ -88,73 +88,6 @@ 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF }; -/* Probe gif video format or gif image format. The current heuristic - supposes the gif87a is always a single image. For gif89a, we - consider it as a video only if a GCE extension is present in the - first kilobyte. */ -static int gif_video_probe(AVProbeData * pd) -{ - const uint8_t *p, *p_end; - int bits_per_pixel, has_global_palette, ext_code, ext_len; - int gce_flags, gce_disposal; - - if (pd->buf_size < 24 || - memcmp(pd->buf, gif89a_sig, 6) != 0) - return 0; - p_end = pd->buf + pd->buf_size; - p = pd->buf + 6; - bits_per_pixel = (p[4] & 0x07) + 1; - has_global_palette = (p[4] & 0x80); - p += 7; - if (has_global_palette) - p += (1 << bits_per_pixel) * 3; - for(;;) { - if (p >= p_end) - return 0; - if (*p != '!') - break; - p++; - if (p >= p_end) - return 0; - ext_code = *p++; - if (p >= p_end) - return 0; - ext_len = *p++; - if (ext_code == 0xf9) { - if (p >= p_end) - return 0; - /* if GCE extension found with gce_disposal != 0: it is - likely to be an animation */ - gce_flags = *p++; - gce_disposal = (gce_flags >> 2) & 0x7; - if (gce_disposal != 0) - return AVPROBE_SCORE_MAX; - else - return 0; - } - for(;;) { - if (ext_len == 0) - break; - p += ext_len; - if (p >= p_end) - return 0; - ext_len = *p++; - } - } - return 0; -} - -static int gif_image_probe(AVProbeData * pd) -{ - if (pd->buf_size >= 24 && - (memcmp(pd->buf, gif87a_sig, 6) == 0 || - memcmp(pd->buf, gif89a_sig, 6) == 0)) - return AVPROBE_SCORE_MAX - 1; - else - return 0; -} - - static void GLZWDecodeInit(GifState * s, int csize) { /* read buffer */ @@ -186,11 +119,11 @@ ptr = s->pbuf; if (ptr >= s->ebuf) { if (!s->eob_reached) { - sizbuf = get_byte(s->f); + sizbuf = bytestream_get_byte(&s->bytestream); s->ebuf = s->buf + sizbuf; s->pbuf = s->buf; if (sizbuf > 0) { - get_buffer(s->f, s->buf, sizbuf); + bytestream_get_buffer(&s->bytestream, s->buf, sizbuf); } else { s->eob_reached = 1; } @@ -290,16 +223,15 @@ static int gif_read_image(GifState *s) { - ByteIOContext *f = s->f; int left, top, width, height, bits_per_pixel, code_size, flags; int is_interleaved, has_local_palette, y, x, pass, y1, linesize, n, i; uint8_t *ptr, *line, *d, *spal, *palette, *sptr, *ptr1; - left = get_le16(f); - top = get_le16(f); - width = get_le16(f); - height = get_le16(f); - flags = get_byte(f); + 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; @@ -308,7 +240,7 @@ #endif if (has_local_palette) { - get_buffer(f, s->local_palette, 3 * (1 << bits_per_pixel)); + bytestream_get_buffer(&s->bytestream, s->local_palette, 3 * (1 << bits_per_pixel)); palette = s->local_palette; } else { palette = s->global_palette; @@ -321,11 +253,6 @@ return -EINVAL; /* build the palette */ - if (s->pix_fmt == PIX_FMT_RGB24) { - line = av_malloc(width); - if (!line) - return -ENOMEM; - } else { n = (1 << bits_per_pixel); spal = palette; for(i = 0; i < n; i++) { @@ -339,11 +266,9 @@ if (s->transparent_color_index >= 0) s->image_palette[s->transparent_color_index] = 0; line = NULL; - } /* now get the image data */ - s->f = f; - code_size = get_byte(f); + code_size = bytestream_get_byte(&s->bytestream); GLZWDecodeInit(s, code_size); /* read all the image */ @@ -353,22 +278,7 @@ pass = 0; y1 = 0; for (y = 0; y < height; y++) { - if (s->pix_fmt == PIX_FMT_RGB24) { - /* transcode to RGB24 */ - GLZWDecode(s, line, width); - d = ptr; - sptr = line; - for(x = 0; x < width; x++) { - spal = palette + sptr[0] * 3; - d[0] = spal[0]; - d[1] = spal[1]; - d[2] = spal[2]; - d += 3; - sptr++; - } - } else { GLZWDecode(s, ptr, width); - } if (is_interleaved) { switch(pass) { default: @@ -413,12 +323,11 @@ static int gif_read_extension(GifState *s) { - ByteIOContext *f = s->f; int ext_code, ext_len, i, gce_flags, gce_transparent_index; /* extension */ - ext_code = get_byte(f); - ext_len = get_byte(f); + ext_code = bytestream_get_byte(&s->bytestream); + ext_len = bytestream_get_byte(&s->bytestream); #ifdef DEBUG printf("gif: ext_code=0x%x len=%d\n", ext_code, ext_len); #endif @@ -427,9 +336,9 @@ if (ext_len != 4) goto discard_ext; s->transparent_color_index = -1; - gce_flags = get_byte(f); - s->gce_delay = get_le16(f); - gce_transparent_index = get_byte(f); + 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 @@ -440,7 +349,7 @@ gce_flags, s->gce_delay, s->transparent_color_index, s->gce_disposal); #endif - ext_len = get_byte(f); + ext_len = bytestream_get_byte(&s->bytestream); break; } @@ -448,8 +357,8 @@ discard_ext: while (ext_len != 0) { for (i = 0; i < ext_len; i++) - get_byte(f); - ext_len = get_byte(f); + bytestream_get_byte(&s->bytestream); + ext_len = bytestream_get_byte(&s->bytestream); #ifdef DEBUG printf("gif: ext_len1=%d\n", ext_len); #endif @@ -459,35 +368,32 @@ static int gif_read_header1(GifState *s) { - ByteIOContext *f = s->f; uint8_t sig[6]; int ret, v, n; int has_global_palette; /* read gif signature */ - ret = get_buffer(f, sig, 6); - if (ret != 6) - return -1; + 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 = get_le16(f); - s->screen_height = get_le16(f); + 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 = get_byte(f); + 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 = get_byte(f); - get_byte(f); /* ignored */ + s->background_color_index = bytestream_get_byte(&s->bytestream); + bytestream_get_byte(&s->bytestream); /* ignored */ #ifdef DEBUG printf("gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", s->screen_width, s->screen_height, s->bits_per_pixel, @@ -495,39 +401,38 @@ #endif if (has_global_palette) { n = 1 << s->bits_per_pixel; - get_buffer(f, s->global_palette, n * 3); + bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3); } return 0; } static int gif_parse_next_image(GifState *s) { - ByteIOContext *f = s->f; int ret, code; for (;;) { - code = url_fgetc(f); + code = bytestream_get_byte(&s->bytestream); #ifdef DEBUG printf("gif: code=%02x '%c'\n", code, code); #endif switch (code) { case ',': if (gif_read_image(s) < 0) - return AVERROR_IO; + return -1; ret = 0; goto the_end; case ';': /* end of image */ - ret = AVERROR_IO; + ret = -1; goto the_end; case '!': if (gif_read_extension(s) < 0) - return AVERROR_IO; + return -1; break; case EOF: default: /* error or errneous EOF */ - ret = AVERROR_IO; + ret = -1; goto the_end; } } @@ -535,14 +440,20 @@ return ret; } -static int gif_read_header(AVFormatContext * s1, - AVFormatParameters * ap) +static int gif_decode_init(AVCodecContext *avctx) +{ + GifState *s = avctx->priv_data; + + return 0; +} + +static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) { - GifState *s = s1->priv_data; - ByteIOContext *f = &s1->pb; - AVStream *st; + GifState *s = avctx->priv_data; + AVFrame *picture = data; + int ret; - s->f = f; + s->bytestream = buf; if (gif_read_header1(s) < 0) return -1; @@ -551,94 +462,34 @@ s->image_buf = av_malloc(s->screen_height * s->image_linesize); if (!s->image_buf) return -ENOMEM; - s->pix_fmt = PIX_FMT_RGB24; + s->pix_fmt = PIX_FMT_PAL8; /* now we are ready: build format streams */ - st = av_new_stream(s1, 0); - if (!st) - return -1; - st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RAWVIDEO; - st->codec->time_base.den = 5; - st->codec->time_base.num = 1; /* XXX: check if screen size is always valid */ - st->codec->width = s->screen_width; - st->codec->height = s->screen_height; - st->codec->pix_fmt = PIX_FMT_RGB24; - return 0; -} - -static int gif_read_packet(AVFormatContext * s1, - AVPacket * pkt) -{ - GifState *s = s1->priv_data; - int ret; + avctx->width = s->screen_width; + avctx->height = s->screen_height; + avctx->pix_fmt = PIX_FMT_PAL8; ret = gif_parse_next_image(s); if (ret < 0) return ret; - /* XXX: avoid copying */ - if (av_new_packet(pkt, s->screen_width * s->screen_height * 3)) { - return AVERROR_IO; - } - pkt->stream_index = 0; - memcpy(pkt->data, s->image_buf, s->screen_width * s->screen_height * 3); - return 0; -} + picture->data[0] = s->image_buf; + picture->linesize[0] = s->image_linesize; + picture->data[1] = s->image_palette; + picture->linesize[1] = 4; -static int gif_read_close(AVFormatContext *s1) -{ - GifState *s = s1->priv_data; - av_free(s->image_buf); + *data_size = sizeof(AVPicture); return 0; } -/* read gif as image */ -static int gif_read(ByteIOContext *f, - int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) -{ - GifState s1, *s = &s1; - AVImageInfo info1, *info = &info1; - int ret; - - memset(s, 0, sizeof(GifState)); - s->f = f; - if (gif_read_header1(s) < 0) - return -1; - info->width = s->screen_width; - info->height = s->screen_height; - info->pix_fmt = PIX_FMT_PAL8; - ret = alloc_cb(opaque, info); - if (ret) - return ret; - s->image_buf = info->pict.data[0]; - s->image_linesize = info->pict.linesize[0]; - s->image_palette = (uint32_t *)info->pict.data[1]; - - if (gif_parse_next_image(s) < 0) - return -1; - return 0; -} - -AVInputFormat gif_demuxer = -{ +AVCodec gif_decoder = { "gif", - "gif format", + CODEC_TYPE_VIDEO, + CODEC_ID_GIF, sizeof(GifState), - gif_video_probe, - gif_read_header, - gif_read_packet, - gif_read_close, -}; - -AVImageFormat gif_image_format = { - "gif", - "gif", - gif_image_probe, - gif_read, - (1 << PIX_FMT_PAL8), -#ifdef CONFIG_GIF_MUXER - gif_write, -#endif + gif_decode_init, + NULL, + NULL, + gif_decode_frame, };

1 0

r6758 - trunk/libavformat/nsvdec.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: bcoudurier Date: Sun Oct 22 16:14:36 2006 New Revision: 6758 Modified: trunk/libavformat/nsvdec.c Log: disable annoying debug messages Modified: trunk/libavformat/nsvdec.c ============================================================================== --- trunk/libavformat/nsvdec.c (original) +++ trunk/libavformat/nsvdec.c Sun Oct 22 16:14:36 2006 @@ -21,7 +21,7 @@ #include "avformat.h" #include "riff.h" -#define DEBUG +//#define DEBUG //#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!! //#define DEBUG_SEEK #define CHECK_SUBSEQUENT_NSVS

2 1

r6759 - trunk/configure
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: lu_zero Date: Sun Oct 22 16:47:12 2006 New Revision: 6759 Modified: trunk/configure Log: use --as-needed just on linux, since *bsd way is broken... (patch from Diego Petten? <flameeyes at gentoo.org>) Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sun Oct 22 16:47:12 2006 @@ -618,6 +618,7 @@ SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a' ;; Linux) +check_ldflags '-Wl,--as-needed' ;; IRIX*) targetos=IRIX @@ -1518,7 +1519,7 @@ check_cflags -Winline # add some linker flags -check_ldflags '-Wl,--as-needed' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavformat' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' +check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavformat' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' # not all compilers support -Os test "$optimize" = "small" && check_cflags -Os

1 0

r6757 - trunk/vhook/watermark.c
by subversion＠mplayerhq.hu 22 Oct '06

22 Oct '06

Author: diego Date: Sun Oct 22 14:12:44 2006 New Revision: 6757 Modified: trunk/vhook/watermark.c Log: spelling/grammar fixes Modified: trunk/vhook/watermark.c ============================================================================== --- trunk/vhook/watermark.c (original) +++ trunk/vhook/watermark.c Sun Oct 22 14:12:44 2006 @@ -2,39 +2,39 @@ * Watermark Hook * Copyright (c) 2005 Marcus Engene myfirstname(at)mylastname.se * - * flags to watermark: + * parameters for watermark: * -m nbr = nbr is 0..1. 0 is the default mode, see below. * -t nbr = nbr is six digit hex. Threshold. - * -f file = File is the filename of watermark image. You must specify this! + * -f file = file is the watermark image filename. You must specify this! * * MODE 0: - * The watermarkpicture works like this. (Assuming colorintencities 0..0xff) + * The watermark picture works like this (assuming color intensities 0..0xff): * Per color do this: - * If mask color is 0x80, no change to original frame. - * If mask color is < 0x80 the abs difference is subtracted from frame. If + * If mask color is 0x80, no change to the original frame. + * If mask color is < 0x80 the abs difference is subtracted from the frame. If * result < 0, result = 0 - * If mask color is > 0x80 the abs difference is added to frame. If result + * If mask color is > 0x80 the abs difference is added to the frame. If result * > 0xff, result = 0xff * - * You can override the 0x80 level with the -t flag. Eg if threshold is 000000 - * the color values of watermark is added to destination. + * You can override the 0x80 level with the -t flag. E.g. if threshold is + * 000000 the color value of watermark is added to the destination. * * This way a mask that is visible both in light pictures and in dark can be - * made (fex by using a picture generated by gimp and the bump map tool). + * made (fex by using a picture generated by Gimp and the bump map tool). * * An example watermark file is at * http://engene.se/ffmpeg_watermark.gif * * MODE 1: * Per color do this: - * If mask color > threshold color, watermark pixel is going to be used. + * If mask color > threshold color then the watermark pixel is used. * * Example usage: * ffmpeg -i infile -vhook '/path/watermark.so -f wm.gif' -an out.mov * ffmpeg -i infile -vhook '/path/watermark.so -f wm.gif -m 1 -t 222222' -an out.mov * * Note that the entire vhook argument is encapsulated in ''. This - * way, arguments to the vhook won't be mixed up with those to ffmpeg. + * way, arguments to the vhook won't be mixed up with those for ffmpeg. * * This file is part of FFmpeg. *

1 0