Attachment #83965 for bug #128893

View | Details | Raw Unified | Return to bug 128893
Collapse All | Expand All




	p->format.video.codec = pixel_fmts[vc->ctx->pix_fmt];
	p->format.video.width = vc->ctx->width;
	p->format.video.height = vc->ctx->height;
	if(vc->ctx->time_base.num){
	    vc->ptsn = (uint64_t) 27000000 * vc->ctx->time_base.num;
	    vc->ptsd = vc->ctx->time_base.den;
	    p->format.video.frame_rate.num = vc->ctx->time_base.den;
	    p->format.video.frame_rate.den = vc->ctx->time_base.num;
	} else {
	    vc->ptsn = 27000000;
	    vc->ptsd = 25;

    case STREAM_TYPE_VIDEO:
	avctx->width = s->video.width;
	avctx->height = s->video.height;
	avctx->time_base.den = s->video.frame_rate.num;
	avctx->time_base.num = s->video.frame_rate.den;

	ac->ptsn = (uint64_t) 27000000 * s->video.frame_rate.den;
	ac->ptsd = s->video.frame_rate.num?: 1;

Lines 96-103 Link Here

(-)tcvp-0.2.0/src/codec/avcodec/encode.c (-2 / +2 lines)
96	p->format.common.codec = enc->codec;	96	p->format.common.codec = enc->codec;
97	p->format.common.bit_rate = ctx->bit_rate;	97	p->format.common.bit_rate = ctx->bit_rate;
98		98
99	ctx->frame_rate = s->video.frame_rate.num;	99	ctx->time_base.den = s->video.frame_rate.num;
100	ctx->frame_rate_base = s->video.frame_rate.den;	100	ctx->time_base.num = s->video.frame_rate.den;
101	ctx->width = s->video.width;	101	ctx->width = s->video.width;
102	ctx->height = s->video.height;	102	ctx->height = s->video.height;
103	if(s->video.aspect.num){	103	if(s->video.aspect.num){




    ms->n_streams = afc->nb_streams;
    ms->streams = calloc(ms->n_streams, sizeof(*ms->streams));
    for(i = 0; i < ms->n_streams; i++){
	switch(afc->streams[i]->codec->codec_type){
	case CODEC_TYPE_VIDEO:
	    ms->streams[i].stream_type = STREAM_TYPE_VIDEO;
	    ms->streams[i].video.frame_rate.num =
		afc->streams[i]->codec->time_base.den;
	    ms->streams[i].video.frame_rate.den =
		afc->streams[i]->codec->time_base.num;
	    ms->streams[i].video.width = afc->streams[i]->codec->width;
	    ms->streams[i].video.height = afc->streams[i]->codec->height;
	    ms->streams[i].video.codec =
		codec_names[afc->streams[i]->codec->codec_id];
	    break;

	case CODEC_TYPE_AUDIO:
	    ms->streams[i].stream_type = STREAM_TYPE_AUDIO;
	    ms->streams[i].audio.sample_rate =
		afc->streams[i]->codec->sample_rate;
	    ms->streams[i].audio.channels = afc->streams[i]->codec->channels;
	    ms->streams[i].audio.codec =
		codec_names[afc->streams[i]->codec->codec_id];
	    ms->streams[i].audio.bit_rate = afc->streams[i]->codec->bit_rate;
	    break;

	default:

	    break;
	}

	ms->streams[i].common.codec_data = afc->streams[i]->codec->extradata;
	ms->streams[i].common.codec_data_size =
	    afc->streams[i]->codec->extradata_size;
	ms->streams[i].common.index = i;
    }
    ms->used_streams = calloc(ms->n_streams, sizeof(*ms->used_streams));




    avf->streams[s->common.index].avidx = ai;
    avf->streams[s->common.index].used = 1;
    as = avf->fc.streams[ai];
    as->codec->codec_id = avf_codec_id(s->common.codec);
    as->codec->coded_frame = avcodec_alloc_frame();
    as->codec->bit_rate = s->common.bit_rate;
    if(s->stream_type == STREAM_TYPE_VIDEO){
	as->codec->codec_type = CODEC_TYPE_VIDEO;
	as->codec->time_base.den = s->video.frame_rate.num;
	as->codec->time_base.num = s->video.frame_rate.den;
	as->codec->width = s->video.width;
	as->codec->height = s->video.height;
    } else if(s->stream_type == STREAM_TYPE_AUDIO){
	as->codec->codec_type = CODEC_TYPE_AUDIO;
	as->codec->sample_rate = s->audio.sample_rate;
	as->codec->channels = s->audio.channels;
    }

    return PROBE_OK;

Return to bug 128893

Lines 280-290 Link Here

(-)tcvp-0.2.0/src/codec/avcodec/avcodec.c (-7 / +7 lines)
280	p->format.video.codec = pixel_fmts[vc->ctx->pix_fmt];	280	p->format.video.codec = pixel_fmts[vc->ctx->pix_fmt];
281	p->format.video.width = vc->ctx->width;	281	p->format.video.width = vc->ctx->width;
282	p->format.video.height = vc->ctx->height;	282	p->format.video.height = vc->ctx->height;
283	if(vc->ctx->frame_rate){	283	if(vc->ctx->time_base.num){
284	vc->ptsn = (uint64_t) 27000000 * vc->ctx->frame_rate_base;	284	vc->ptsn = (uint64_t) 27000000 * vc->ctx->time_base.num;
285	vc->ptsd = vc->ctx->frame_rate;	285	vc->ptsd = vc->ctx->time_base.den;
286	p->format.video.frame_rate.num = vc->ctx->frame_rate;	286	p->format.video.frame_rate.num = vc->ctx->time_base.den;
287	p->format.video.frame_rate.den = vc->ctx->frame_rate_base;	287	p->format.video.frame_rate.den = vc->ctx->time_base.num;
288	} else {	288	} else {
289	vc->ptsn = 27000000;	289	vc->ptsn = 27000000;
290	vc->ptsd = 25;	290	vc->ptsd = 25;
Lines 374-381 Link Here
374	case STREAM_TYPE_VIDEO:	374	case STREAM_TYPE_VIDEO:
375	avctx->width = s->video.width;	375	avctx->width = s->video.width;
376	avctx->height = s->video.height;	376	avctx->height = s->video.height;
377	avctx->frame_rate = s->video.frame_rate.num;	377	avctx->time_base.den = s->video.frame_rate.num;
378	avctx->frame_rate_base = s->video.frame_rate.den;	378	avctx->time_base.num = s->video.frame_rate.den;
379		379
380	ac->ptsn = (uint64_t) 27000000 * s->video.frame_rate.den;	380	ac->ptsn = (uint64_t) 27000000 * s->video.frame_rate.den;
381	ac->ptsd = s->video.frame_rate.num?: 1;	381	ac->ptsd = s->video.frame_rate.num?: 1;

Lines 213-239 Link Here

(-)tcvp-0.2.0/src/demuxer/avformat/avformat.c (-12 / +12 lines)
213	ms->n_streams = afc->nb_streams;	213	ms->n_streams = afc->nb_streams;
214	ms->streams = calloc(ms->n_streams, sizeof(*ms->streams));	214	ms->streams = calloc(ms->n_streams, sizeof(*ms->streams));
215	for(i = 0; i < ms->n_streams; i++){	215	for(i = 0; i < ms->n_streams; i++){
216	switch(afc->streams[i]->codec.codec_type){	216	switch(afc->streams[i]->codec->codec_type){
217	case CODEC_TYPE_VIDEO:	217	case CODEC_TYPE_VIDEO:
218	ms->streams[i].stream_type = STREAM_TYPE_VIDEO;	218	ms->streams[i].stream_type = STREAM_TYPE_VIDEO;
219	ms->streams[i].video.frame_rate.num =	219	ms->streams[i].video.frame_rate.num =
220	afc->streams[i]->codec.frame_rate;	220	afc->streams[i]->codec->time_base.den;
221	ms->streams[i].video.frame_rate.den =	221	ms->streams[i].video.frame_rate.den =
222	afc->streams[i]->codec.frame_rate_base;	222	afc->streams[i]->codec->time_base.num;
223	ms->streams[i].video.width = afc->streams[i]->codec.width;	223	ms->streams[i].video.width = afc->streams[i]->codec->width;
224	ms->streams[i].video.height = afc->streams[i]->codec.height;	224	ms->streams[i].video.height = afc->streams[i]->codec->height;
225	ms->streams[i].video.codec =	225	ms->streams[i].video.codec =
226	codec_names[afc->streams[i]->codec.codec_id];	226	codec_names[afc->streams[i]->codec->codec_id];
227	break;	227	break;
228		228
229	case CODEC_TYPE_AUDIO:	229	case CODEC_TYPE_AUDIO:
230	ms->streams[i].stream_type = STREAM_TYPE_AUDIO;	230	ms->streams[i].stream_type = STREAM_TYPE_AUDIO;
231	ms->streams[i].audio.sample_rate =	231	ms->streams[i].audio.sample_rate =
232	afc->streams[i]->codec.sample_rate;	232	afc->streams[i]->codec->sample_rate;
233	ms->streams[i].audio.channels = afc->streams[i]->codec.channels;	233	ms->streams[i].audio.channels = afc->streams[i]->codec->channels;
234	ms->streams[i].audio.codec =	234	ms->streams[i].audio.codec =
235	codec_names[afc->streams[i]->codec.codec_id];	235	codec_names[afc->streams[i]->codec->codec_id];
236	ms->streams[i].audio.bit_rate = afc->streams[i]->codec.bit_rate;	236	ms->streams[i].audio.bit_rate = afc->streams[i]->codec->bit_rate;
237	break;	237	break;
238		238
239	default:	239	default:
Lines 241-249 Link Here
241	break;	241	break;
242	}	242	}
243		243
244	ms->streams[i].common.codec_data = afc->streams[i]->codec.extradata;	244	ms->streams[i].common.codec_data = afc->streams[i]->codec->extradata;
245	ms->streams[i].common.codec_data_size =	245	ms->streams[i].common.codec_data_size =
246	afc->streams[i]->codec.extradata_size;	246	afc->streams[i]->codec->extradata_size;
247	ms->streams[i].common.index = i;	247	ms->streams[i].common.index = i;
248	}	248	}
249	ms->used_streams = calloc(ms->n_streams, sizeof(*ms->used_streams));	249	ms->used_streams = calloc(ms->n_streams, sizeof(*ms->used_streams));

Lines 117-135 Link Here

(-)tcvp-0.2.0/src/demuxer/avformat/avfwrite.c (-11 / +11 lines)
117	avf->streams[s->common.index].avidx = ai;	117	avf->streams[s->common.index].avidx = ai;
118	avf->streams[s->common.index].used = 1;	118	avf->streams[s->common.index].used = 1;
119	as = avf->fc.streams[ai];	119	as = avf->fc.streams[ai];
120	as->codec.codec_id = avf_codec_id(s->common.codec);	120	as->codec->codec_id = avf_codec_id(s->common.codec);
121	as->codec.coded_frame = avcodec_alloc_frame();	121	as->codec->coded_frame = avcodec_alloc_frame();
122	as->codec.bit_rate = s->common.bit_rate;	122	as->codec->bit_rate = s->common.bit_rate;
123	if(s->stream_type == STREAM_TYPE_VIDEO){	123	if(s->stream_type == STREAM_TYPE_VIDEO){
124	as->codec.codec_type = CODEC_TYPE_VIDEO;	124	as->codec->codec_type = CODEC_TYPE_VIDEO;
125	as->codec.frame_rate = s->video.frame_rate.num;	125	as->codec->time_base.den = s->video.frame_rate.num;
126	as->codec.frame_rate_base = s->video.frame_rate.den;	126	as->codec->time_base.num = s->video.frame_rate.den;
127	as->codec.width = s->video.width;	127	as->codec->width = s->video.width;
128	as->codec.height = s->video.height;	128	as->codec->height = s->video.height;
129	} else if(s->stream_type == STREAM_TYPE_AUDIO){	129	} else if(s->stream_type == STREAM_TYPE_AUDIO){
130	as->codec.codec_type = CODEC_TYPE_AUDIO;	130	as->codec->codec_type = CODEC_TYPE_AUDIO;
131	as->codec.sample_rate = s->audio.sample_rate;	131	as->codec->sample_rate = s->audio.sample_rate;
132	as->codec.channels = s->audio.channels;	132	as->codec->channels = s->audio.channels;
133	}	133	}
134		134
135	return PROBE_OK;	135	return PROBE_OK;