July 2007 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r532 - matroska/matroskaenc.c
by conrad 10 Aug '07

10 Aug '07

Author: conrad Date: Thu Jul 26 02:05:32 2007 New Revision: 532 Log: Write segment UID Modified: matroska/matroskaenc.c Modified: matroska/matroskaenc.c ============================================================================== --- matroska/matroskaenc.c (original) +++ matroska/matroskaenc.c Thu Jul 26 02:05:32 2007 @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "random.h" #include "riff.h" #include "xiph.h" #include "matroska.h" @@ -61,6 +62,8 @@ typedef struct MatroskaMuxContext { mkv_seekhead *main_seekhead; mkv_seekhead *cluster_seekhead; mkv_cues *cues; + + AVRandomState rand_state; } MatroskaMuxContext; static void put_ebml_id(ByteIOContext *pb, unsigned int id) @@ -507,6 +510,9 @@ static int mkv_write_header(AVFormatCont MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = &s->pb; offset_t ebml_header, segment_info; + int i; + + av_init_random(av_gettime(), &mkv->rand_state); ebml_header = start_ebml_master(pb, EBML_ID_HEADER); put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1); @@ -536,11 +542,16 @@ static int mkv_write_header(AVFormatCont if (strlen(s->title)) put_ebml_string(pb, MATROSKA_ID_TITLE, s->title); if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + uint8_t segmentuid[16]; + for (i = 0; i < 16; i++) + segmentuid[i] = av_random(&mkv->rand_state); + put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); put_ebml_date (pb, MATROSKA_ID_DATEUTC , av_gettime() ); + put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segmentuid, 16); } - // XXX: segment UID + // reserve space for the duration mkv->duration = 0; mkv->duration_offset = url_ftell(pb);

5 17

commit access to soc repos
by Luca Barbato 08 Aug '07

08 Aug '07

Looks like I don't have commit access, anybody could address that? lu -- Luca Barbato Gentoo/linux Gentoo/PPC http://dev.gentoo.org/~lu_zero

4 6

[soc]: r575 - libavfilter/avfiltergraph.c
by koorogi 31 Jul '07

31 Jul '07

Author: koorogi Date: Tue Jul 31 22:11:25 2007 New Revision: 575 Log: Fix memory leak. Modified: libavfilter/avfiltergraph.c Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Tue Jul 31 22:11:25 2007 @@ -75,6 +75,8 @@ static AVFilterContext *create_filter_wi } } else av_log(NULL, AV_LOG_ERROR, "error creating filter!\n"); + av_free(filter); + return ret; fail:

1 0

[soc]: r574 - in libavfilter: allfilters.h avfilter.c avfiltergraph.c avfiltergraph.h filter_test.c
by koorogi 31 Jul '07

31 Jul '07

Author: koorogi Date: Tue Jul 31 22:08:38 2007 New Revision: 574 Log: Make the filter graph just another normal filter. Modified: libavfilter/allfilters.h libavfilter/avfilter.c libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/filter_test.c Modified: libavfilter/allfilters.h ============================================================================== --- libavfilter/allfilters.h (original) +++ libavfilter/allfilters.h Tue Jul 31 22:08:38 2007 @@ -24,6 +24,7 @@ extern AVFilter vsrc_dummy; extern AVFilter vsrc_ppm; extern AVFilter vf_crop; +extern AVFilter vf_graph; extern AVFilter vf_passthrough; extern AVFilter vf_rgb2bgr; extern AVFilter vf_slicify; Modified: libavfilter/avfilter.c ============================================================================== --- libavfilter/avfilter.c (original) +++ libavfilter/avfilter.c Tue Jul 31 22:08:38 2007 @@ -283,6 +283,7 @@ void avfilter_init(void) avfilter_register(&vsrc_dummy); avfilter_register(&vsrc_ppm); avfilter_register(&vf_crop); + avfilter_register(&vf_graph); avfilter_register(&vf_passthrough); avfilter_register(&vf_rgb2bgr); avfilter_register(&vf_slicify); Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Tue Jul 31 22:08:38 2007 @@ -26,31 +26,24 @@ #include "avfilter.h" #include "avfiltergraph.h" -struct AVFilterGraph { +typedef struct AVFilterGraph { unsigned filter_count; AVFilterContext **filters; -}; +} GraphContext; -AVFilterGraph *avfilter_create_graph(void) +static void uninit(AVFilterContext *ctx) { - return av_mallocz(sizeof(AVFilterGraph)); -} + GraphContext *graph = ctx->priv; -static void destroy_graph_filters(AVFilterGraph *graph) -{ for(; graph->filter_count > 0; graph->filter_count --) avfilter_destroy(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); } -void avfilter_destroy_graph(AVFilterGraph *graph) +void avfilter_graph_add_filter(AVFilterContext *graphctx, AVFilterContext *filter) { - destroy_graph_filters(graph); - av_free(graph); -} + GraphContext *graph = graphctx->priv; -void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) -{ graph->filters = av_realloc(graph->filters, sizeof(AVFilterContext*) * ++graph->filter_count); graph->filters[graph->filter_count - 1] = filter; @@ -89,7 +82,7 @@ fail: return NULL; } -int avfilter_graph_load_chain(AVFilterGraph *graph, +static int graph_load_chain(AVFilterContext *graphctx, unsigned count, char **filter_list, void **opaque, AVFilterContext **first, AVFilterContext **last) { @@ -112,7 +105,7 @@ int avfilter_graph_load_chain(AVFilterGr goto fail; } } - avfilter_graph_add_filter(graph, filters[1]); + avfilter_graph_add_filter(graphctx, filters[1]); filters[0] = filters[1]; } @@ -120,9 +113,68 @@ int avfilter_graph_load_chain(AVFilterGr return 0; fail: - destroy_graph_filters(graph); + uninit(graphctx); if(first) *first = NULL; if(last) *last = NULL; return -1; } +static int graph_load_chain_from_string(AVFilterContext *ctx, const char *str, + AVFilterContext **first, + AVFilterContext **last) +{ + int count, ret = 0; + char **strings; + char *filt; + + strings = av_malloc(sizeof(char *)); + strings[0] = av_strdup(str); + + filt = strchr(strings[0], ','); + for(count = 1; filt; count ++) { + if(filt == strings[count-1]) { + ret = -1; + goto done; + } + + strings = av_realloc(strings, sizeof(char *) * (count+1)); + strings[count] = filt + 1; + *filt = '\0'; + filt = strchr(strings[count], ','); + } + + ret = graph_load_chain(ctx, count, strings, NULL, first, last); + +done: + av_free(strings[0]); + av_free(strings); + + return ret; +} + +static int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + AVFilterContext **filters = opaque; + + if(!args) + return 0; + if(!opaque) + return -1; + + return graph_load_chain_from_string(ctx, args, filters, filters + 1); +} + +AVFilter vf_graph = +{ + .name = "graph", + .author = "Bobby Bingham", + + .priv_size = sizeof(GraphContext), + + .init = init, + .uninit = uninit, + + .inputs = (AVFilterPad[]) {{ .name = NULL, }}, + .outputs = (AVFilterPad[]) {{ .name = NULL, }}, +}; + Modified: libavfilter/avfiltergraph.h ============================================================================== --- libavfilter/avfiltergraph.h (original) +++ libavfilter/avfiltergraph.h Tue Jul 31 22:08:38 2007 @@ -24,37 +24,11 @@ #include "avfilter.h" -typedef struct AVFilterGraph AVFilterGraph; - -/** - * Create a new filter graph - */ -AVFilterGraph *avfilter_create_graph(void); - -/** - * Destroy a filter graph, and any filters in it. - * @param graph The filter graph to destroy - */ -void avfilter_destroy_graph(AVFilterGraph *graph); - /** * Add an existing filter instance to a filter graph. * @param graph The filter graph * @param filter The filter to be added */ -void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter); +void avfilter_graph_add_filter(AVFilterContext *graphctx, AVFilterContext *filter); -/** - * Loads the filter graph with a simple chain described by filters. - * @param graph The filter graph to load filters into - * @param count The number of filters to be created - * @param filters_list An array of strings describing the filters to be created. - * The format of each string is "name=params". - * @param first If non-NULL, will be set to the first filter in the chain. - * @param last If non-NULL, will be set to the last filter in the chain. - * @return 0 on success. -1 on error. - */ -int avfilter_graph_load_chain(AVFilterGraph *graph, - unsigned count, char **filter_list, void **opaque, - AVFilterContext **first, AVFilterContext **last); #endif /* FFMPEG_AVFILTER_H */ Modified: libavfilter/filter_test.c ============================================================================== --- libavfilter/filter_test.c (original) +++ libavfilter/filter_test.c Tue Jul 31 22:08:38 2007 @@ -31,21 +31,21 @@ int main(int argc, char **argv) int i; int ret = -1; int64_t pts = 0, newpts; - AVFilterGraph *graph; - AVFilterContext *out; + AVFilterContext *graph; + AVFilterContext *filters[2]; - if(argc < 3) { - av_log(NULL, AV_LOG_ERROR, "require at least two filters\n"); + if(argc < 2) { + av_log(NULL, AV_LOG_ERROR, "require a list of filters\n"); return -1; } avfilter_init(); - graph = avfilter_create_graph(); - if(avfilter_graph_load_chain(graph, argc - 1, argv + 1, NULL, NULL, &out) < 0) + graph = avfilter_create_by_name("graph", NULL); + if(avfilter_init_filter(graph, argv[1], filters) < 0) goto done; while(pts < 5000) { - newpts = sdl_display(out); + newpts = sdl_display(filters[1]); usleep(newpts - pts); pts = newpts; } @@ -53,7 +53,7 @@ int main(int argc, char **argv) ret = 0; done: - avfilter_destroy_graph(graph); + avfilter_destroy(graph); return ret; }

1 0

[soc]: r573 - in libavfilter: avfilter.c avfilter.h
by koorogi 31 Jul '07

31 Jul '07

Author: koorogi Date: Tue Jul 31 21:20:54 2007 New Revision: 573 Log: Make input/output pads modifiable on a per-instance basis. This makes it possible to change filter callbacks (eg. to a SIMD version on supported processors). It also allows filters to change their own input and output pads. Modified: libavfilter/avfilter.c libavfilter/avfilter.h Modified: libavfilter/avfilter.c ============================================================================== --- libavfilter/avfilter.c (original) +++ libavfilter/avfilter.c Tue Jul 31 21:20:54 2007 @@ -163,11 +163,11 @@ int avfilter_link(AVFilterContext *src, /* find a format both filters support - TODO: auto-insert conversion filter */ link->format = -1; - if(src->filter->outputs[srcpad].query_formats) - fmts[0] = src->filter->outputs[srcpad].query_formats(link); + if(src->output_pads[srcpad].query_formats) + fmts[0] = src->output_pads[srcpad].query_formats(link); else fmts[0] = default_query_output_formats(link); - fmts[1] = dst->filter-> inputs[dstpad].query_formats(link); + fmts[1] = dst->input_pads[dstpad].query_formats(link); for(i = 0; fmts[0][i] != -1; i ++) for(j = 0; fmts[1][j] != -1; j ++) if(fmts[0][i] == fmts[1][j]) { @@ -186,13 +186,13 @@ format_done: return -1; } - if (src->filter->outputs[srcpad].config_props) - src->filter->outputs[srcpad].config_props(link); + if (src->output_pads[srcpad].config_props) + src->output_pads[srcpad].config_props(link); else default_config_output_link(link); - if (dst->filter->inputs[dstpad].config_props) - dst->filter->inputs[dstpad].config_props(link); + if (dst->input_pads[dstpad].config_props) + dst->input_pads[dstpad].config_props(link); return 0; } @@ -201,8 +201,8 @@ AVFilterPicRef *avfilter_get_video_buffe { AVFilterPicRef *ret = NULL; - if(link->dst->filter->inputs[link->dstpad].get_video_buffer) - ret = link->dst->filter->inputs[link->dstpad].get_video_buffer(link, perms); + if(link->dst->input_pads[link->dstpad].get_video_buffer) + ret = link->dst->input_pads[link->dstpad].get_video_buffer(link, perms); if(!ret) ret = avfilter_default_get_video_buffer(link, perms); @@ -212,7 +212,7 @@ AVFilterPicRef *avfilter_get_video_buffe void avfilter_request_frame(AVFilterLink *link) { - const AVFilterPad *pad = &link->src->filter->outputs[link->srcpad]; + const AVFilterPad *pad = &link->src->output_pads[link->srcpad]; if(pad->request_frame) pad->request_frame(link); @@ -226,7 +226,7 @@ void avfilter_start_frame(AVFilterLink * { void (*start_frame)(AVFilterLink *, AVFilterPicRef *); - start_frame = link->dst->filter->inputs[link->dstpad].start_frame; + start_frame = link->dst->input_pads[link->dstpad].start_frame; if(!start_frame) start_frame = avfilter_default_start_frame; @@ -237,7 +237,7 @@ void avfilter_end_frame(AVFilterLink *li { void (*end_frame)(AVFilterLink *); - end_frame = link->dst->filter->inputs[link->dstpad].end_frame; + end_frame = link->dst->input_pads[link->dstpad].end_frame; if(!end_frame) end_frame = avfilter_default_end_frame; @@ -246,10 +246,10 @@ void avfilter_end_frame(AVFilterLink *li void avfilter_draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h) { - if(!link->dst->filter->inputs[link->dstpad].draw_slice) + if(!link->dst->input_pads[link->dstpad].draw_slice) return; - link->dst->filter->inputs[link->dstpad].draw_slice(link, data, y, h); + link->dst->input_pads[link->dstpad].draw_slice(link, data, y, h); } static int filter_cmp(const void *aa, const void *bb) @@ -321,8 +321,13 @@ AVFilterContext *avfilter_create(AVFilte ret->priv = av_mallocz(filter->priv_size); ret->input_count = pad_count(filter->inputs); + ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->input_count); + memcpy(ret->input_pads, filter->inputs, sizeof(AVFilterPad)*ret->input_count); ret->inputs = av_mallocz(sizeof(AVFilterLink*) * ret->input_count); + ret->output_count = pad_count(filter->outputs); + ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->output_count); + memcpy(ret->output_pads, filter->outputs, sizeof(AVFilterPad)*ret->output_count); ret->outputs = av_mallocz(sizeof(AVFilterLink*) * ret->output_count); return ret; @@ -335,18 +340,20 @@ void avfilter_destroy(AVFilterContext *f if(filter->filter->uninit) filter->filter->uninit(filter); - for(i = 0; i < pad_count(filter->filter->inputs); i ++) { + for(i = 0; i < filter->input_count; i ++) { if(filter->inputs[i]) filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL; av_free(filter->inputs[i]); } - for(i = 0; i < pad_count(filter->filter->outputs); i ++) { + for(i = 0; i < filter->output_count; i ++) { if(filter->outputs[i]) filter->outputs[i]->dst->inputs[filter->outputs[i]->dstpad] = NULL; av_free(filter->outputs[i]); } av_free(filter->name); + av_free(filter->input_pads); + av_free(filter->output_pads); av_free(filter->inputs); av_free(filter->outputs); av_free(filter->priv); Modified: libavfilter/avfilter.h ============================================================================== --- libavfilter/avfilter.h (original) +++ libavfilter/avfilter.h Tue Jul 31 21:20:54 2007 @@ -185,9 +185,11 @@ struct AVFilterContext char *name; unsigned input_count; + AVFilterPad *input_pads; AVFilterLink **inputs; unsigned output_count; + AVFilterPad *output_pads; AVFilterLink **outputs; void *priv;

1 0

[soc]: r572 - rv40/rv40.c
by kostya 31 Jul '07

31 Jul '07

Author: kostya Date: Tue Jul 31 19:02:35 2007 New Revision: 572 Log: Introduce colour artifacts to the decoded frames Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Tue Jul 31 19:02:35 2007 @@ -704,11 +704,13 @@ static void rv40_output_macroblock(RV40D MpegEncContext *s = &r->s; DSPContext *dsp = &s->dsp; int i, j, x, y; - uint8_t *Y, *YY; + uint8_t *Y, *YY, *U, *V; int no_up, no_left, itype; no_up = s->first_slice_line; Y = s->dest[0]; + U = s->dest[1]; + V = s->dest[2]; if(!is16){ for(j = 0; j < 4; j++){ no_left = !s->mb_x || (s->mb_x == s->resync_mb_x && s->first_slice_line); @@ -721,6 +723,27 @@ static void rv40_output_macroblock(RV40D Y += s->linesize * 4; intra_types += r->intra_types_stride; } + intra_types -= r->intra_types_stride * 4; + no_up = s->first_slice_line; + for(j = 0; j < 2; j++){ + no_left = !s->mb_x || (s->mb_x == s->resync_mb_x && s->first_slice_line); + for(i = 0; i < 2; i++, cbp >>= 1, no_left = 0){ + rv40_pred_4x4_block(r, U + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*r->intra_types_stride]], no_up, no_left, i || j, i); + if(!(cbp & 1)) continue; + rv40_add_4x4_block(U + i*4 + j*4*s->uvlinesize, s->uvlinesize, s->block[4], i*4+j*32); + } + no_up = 0; + } + no_up = s->first_slice_line; + for(j = 0; j < 2; j++){ + no_left = !s->mb_x || (s->mb_x == s->resync_mb_x && s->first_slice_line); + for(i = 0; i < 2; i++, cbp >>= 1, no_left = 0){ + rv40_pred_4x4_block(r, V + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*r->intra_types_stride]], no_up, no_left, i || j, i); + if(!(cbp & 1)) continue; + rv40_add_4x4_block(V + i*4 + j*4*s->uvlinesize, s->uvlinesize, s->block[5], i*4+j*32); + } + no_up = 0; + } }else{ no_left = !s->mb_x || (s->mb_x == s->resync_mb_x && s->first_slice_line); itype = ittrans16[intra_types[0]]; @@ -741,6 +764,12 @@ static void rv40_output_macroblock(RV40D Y += s->current_picture.linesize[0] * 8; dsp->add_pixels_clamped(s->block[2], Y, s->current_picture.linesize[0]); dsp->add_pixels_clamped(s->block[3], Y + 8, s->current_picture.linesize[0]); + + if(itype == PLANE_PRED8x8) itype = DC_PRED8x8; + r->h.pred8x8[itype](U, s->uvlinesize); + dsp->add_pixels_clamped(s->block[4], U, s->uvlinesize); + r->h.pred8x8[itype](V, s->uvlinesize); + dsp->add_pixels_clamped(s->block[5], V, s->uvlinesize); } } @@ -840,6 +869,8 @@ static int rv40_decode_slice(RV40DecCont } if(r->prev_si.type){ memcpy(s->current_picture_ptr->data[0],s->last_picture_ptr->data[0],s->linesize*s->avctx->height); +memcpy(s->current_picture_ptr->data[1],s->last_picture_ptr->data[1],s->uvlinesize*s->avctx->height/2); +memcpy(s->current_picture_ptr->data[2],s->last_picture_ptr->data[2],s->uvlinesize*s->avctx->height/2); ff_er_add_slice(s, 0, 0, s->mb_width-1, s->mb_height-1, AC_END|DC_END|MV_END); return 0; }

1 0

[soc]: r571 - rv40/rv40.c
by kostya 31 Jul '07

31 Jul '07

Author: kostya Date: Tue Jul 31 19:00:27 2007 New Revision: 571 Log: Move some code for working with 4x4 subblocks to the separate functions Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Tue Jul 31 19:00:27 2007 @@ -660,14 +660,52 @@ static const int ittrans16[4] = { DC_PRED8x8, VERT_PRED8x8, HOR_PRED8x8, PLANE_PRED8x8, }; +/** + * Perform 4x4 intra prediction + */ +static void rv40_pred_4x4_block(RV40DecContext *r, uint8_t *dst, int stride, int itype, int no_up, int no_left, int no_down, int no_right) +{ + uint8_t *prev = dst - stride + 4; + uint32_t topleft; + + if(no_up && no_left) + itype = DC_128_PRED; + else if(no_up){ + if(itype == VERT_PRED) itype = HOR_PRED; + if(itype == DC_PRED) itype = LEFT_DC_PRED; + if(itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED_RV40_NOTOP; + }else if(no_left){ + if(itype == HOR_PRED) itype = VERT_PRED; + if(itype == DC_PRED) itype = TOP_DC_PRED; + if(itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED; + } + if(no_down){ + if(itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN; + if(itype == HOR_UP_PRED_RV40) itype = HOR_UP_PRED_RV40_NODOWN; + } + if(no_right){ + topleft = dst[-stride + 3] * 0x01010101; + prev = &topleft; + } + r->h.pred4x4[itype](dst, prev, stride); +} + +/** add_pixels_clamped for 4x4 block */ +static void rv40_add_4x4_block(uint8_t *dst, int stride, DCTELEM block[64], int off) +{ + int x, y; + for(y = 0; y < 4; y++) + for(x = 0; x < 4; x++) + dst[x + y*stride] = av_clip_uint8(dst[x + y*stride] + block[off + x+y*8]); +} + static void rv40_output_macroblock(RV40DecContext *r, int *intra_types, int cbp, int is16) { MpegEncContext *s = &r->s; DSPContext *dsp = &s->dsp; int i, j, x, y; - uint8_t *Y, *YY, *PY; + uint8_t *Y, *YY; int no_up, no_left, itype; - uint32_t topleft; no_up = s->first_slice_line; Y = s->dest[0]; @@ -675,31 +713,9 @@ static void rv40_output_macroblock(RV40D for(j = 0; j < 4; j++){ no_left = !s->mb_x || (s->mb_x == s->resync_mb_x && s->first_slice_line); for(YY = Y, i = 0; i < 4; i++, cbp >>= 1, no_left = 0, YY += 4){ - itype = ittrans[intra_types[i]]; - if(no_up && no_left) - itype = DC_128_PRED; - else if(no_up){ - if(itype == VERT_PRED) itype = HOR_PRED; - if(itype == DC_PRED) itype = LEFT_DC_PRED; - if(itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED_RV40_NOTOP; - }else if(no_left){ - if(itype == HOR_PRED) itype = VERT_PRED; - if(itype == DC_PRED) itype = TOP_DC_PRED; - if(itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED; - } - if((i || j==3) && itype == DIAG_DOWN_LEFT_PRED_RV40) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN; - if((i || j==3) && itype == HOR_UP_PRED_RV40) itype = HOR_UP_PRED_RV40_NODOWN; - PY = YY - s->linesize + 4; - if(j && i == 3){ - topleft = YY[-s->linesize + 3] * 0x01010101; - PY = &topleft; - } - r->h.pred4x4[itype](YY, PY, s->linesize); + rv40_pred_4x4_block(r, YY, s->linesize, ittrans[intra_types[i]], no_up, no_left, i || (j==3), i==3); if(!(cbp & 1)) continue; - /* add_pixels_clamped for 4x4 block */ - for(y = 0; y < 4; y++) - for(x = 0; x < 4; x++) - YY[x + y * s->linesize] = av_clip_uint8(YY[x + y * s->linesize] + s->block[(i>>1)+(j&2)][(i&1)*4+(j&1)*32+x+y*8]); + rv40_add_4x4_block(YY, s->linesize, s->block[(i>>1)+(j&2)], (i&1)*4+(j&1)*32); } no_up = 0; Y += s->linesize * 4;

1 0

[soc]: r570 - dvbmuxer/muxer_dev/mpeg_pes_enc.c
by realsun 31 Jul '07

31 Jul '07

Author: realsun Date: Tue Jul 31 17:29:38 2007 New Revision: 570 Log: changed max_delay temporary Modified: dvbmuxer/muxer_dev/mpeg_pes_enc.c Modified: dvbmuxer/muxer_dev/mpeg_pes_enc.c ============================================================================== --- dvbmuxer/muxer_dev/mpeg_pes_enc.c (original) +++ dvbmuxer/muxer_dev/mpeg_pes_enc.c Tue Jul 31 17:29:38 2007 @@ -220,7 +220,9 @@ retry: if(space < packet_size && !ignore_constraints) continue; - if(next_pkt && next_pkt->dts - *scr > max_delay) + /* FIX set max_delay to 0 can temporary produce good stream */ + //if(next_pkt && next_pkt->dts - *scr > max_delay) + if(next_pkt && next_pkt->dts - *scr > 0) continue; if(rel_space > best_score){

1 0

[soc]: r569 - dvbmuxer/muxer_dev/mpegtsenc.c
by realsun 31 Jul '07

31 Jul '07

Author: realsun Date: Tue Jul 31 17:26:30 2007 New Revision: 569 Log: modify pcr init value, and adjust pcr value after a new packet is tobe muxed Modified: dvbmuxer/muxer_dev/mpegtsenc.c Modified: dvbmuxer/muxer_dev/mpegtsenc.c ============================================================================== --- dvbmuxer/muxer_dev/mpegtsenc.c (original) +++ dvbmuxer/muxer_dev/mpegtsenc.c Tue Jul 31 17:26:30 2007 @@ -479,7 +479,7 @@ static int mpegts_write_header(AVFormatC 100 * 16; /* PAT size */ ts->mux_rate = bitrate; } - ts->last_pcr = 10000; /* add a preload value */ + ts->last_pcr = 0; service->pcr_packet_freq = (ts->mux_rate * PCR_RETRANS_TIME) / (TS_PACKET_SIZE * 8 * 1000); @@ -755,6 +755,7 @@ static int output_packet(AVFormatContext if((result = ff_pes_find_beststream(ctx, s->packet_size, flush, &pcr, &best_i)) <= 0) return result; + s->last_pcr = pcr; assert(best_i >= 0); st = ctx->streams[best_i];

1 0

[soc]: r568 - dvbmuxer/muxer_dev/mpegtsenc.c
by realsun 31 Jul '07

31 Jul '07

Author: realsun Date: Tue Jul 31 17:19:38 2007 New Revision: 568 Log: adjust mux rate calculation Modified: dvbmuxer/muxer_dev/mpegtsenc.c Modified: dvbmuxer/muxer_dev/mpegtsenc.c ============================================================================== --- dvbmuxer/muxer_dev/mpegtsenc.c (original) +++ dvbmuxer/muxer_dev/mpegtsenc.c Tue Jul 31 17:19:38 2007 @@ -455,13 +455,23 @@ static int mpegts_write_header(AVFormatC bitrate = 0; for(i=0;i<s->nb_streams;i++) { + int codec_rate; st = s->streams[i]; ts_st = (MpegTSWriteStream*) st->priv_data; + if(st->codec->rc_max_rate || st->codec->codec_type == CODEC_TYPE_VIDEO) + codec_rate= st->codec->rc_max_rate; + else + codec_rate= st->codec->bit_rate; + + if(!codec_rate) + bitrate= (1<<21) * 8/s->nb_streams; + bitrate += codec_rate; + bitrate += st->codec->bit_rate; } if(s->mux_rate) { - ts->mux_rate= (s->mux_rate + (8 * 50) - 1) / (8 * 50); + ts->mux_rate= s->mux_rate; } else { bitrate += bitrate * 25 / (8 * DEFAULT_PES_PAYLOAD_SIZE) + /* PES header size */ bitrate * 4 / (8 * TS_PACKET_SIZE) + /* TS header size */

1 0