diff options
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/dec_video.c | 11 | ||||
-rw-r--r-- | video/decode/dec_video.h | 1 | ||||
-rw-r--r-- | video/decode/dxva2.c | 5 | ||||
-rw-r--r-- | video/decode/vd_lavc.c | 4 |
4 files changed, 5 insertions, 16 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index afbda5142f..0c733b0aa6 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -385,13 +385,6 @@ int video_reconfig_filters(struct dec_video *d_video, struct mp_image_params p = *params; struct sh_video *sh = d_video->header->video; - MP_VERBOSE(d_video, "VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n", - p.w, p.h, sh->fps, sh->bitrate / 1000.0, - sh->bitrate / 8000.0); - - MP_VERBOSE(d_video, "VDec: vo config request - %d x %d (%s)\n", - p.w, p.h, vo_format_name(p.imgfmt)); - float decoder_aspect = p.d_w / (float)p.d_h; if (d_video->initial_decoder_aspect == 0) d_video->initial_decoder_aspect = decoder_aspect; @@ -414,10 +407,6 @@ int video_reconfig_filters(struct dec_video *d_video, // Detect colorspace from resolution. mp_image_params_guess_csp(&p); - // Time to config libvo! - MP_VERBOSE(d_video, "VO Config (%dx%d->%dx%d,0x%X)\n", - p.w, p.h, p.d_w, p.d_h, p.imgfmt); - if (vf_reconfig(d_video->vfilter, params, &p) < 0) { MP_FATAL(d_video, "Cannot initialize video filters.\n"); return -1; diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index ce24d5a58e..5ab7213ee7 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -71,7 +71,6 @@ struct dec_video { // Final PTS of previously decoded image double decoded_pts; - int bitrate; // compressed bits/sec float fps; // FPS from demuxer or from user override float initial_decoder_aspect; diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c index cbd08a7e52..ef7756178d 100644 --- a/video/decode/dxva2.c +++ b/video/decode/dxva2.c @@ -256,6 +256,9 @@ static void copy_nv12_fallback(struct mp_image *dest, uint8_t *src_bits, mp_image_copy(dest, &buf); } +#pragma GCC push_options +#pragma GCC target("sse4.1") + static void copy_nv12_gpu_sse4(struct mp_image *dest, uint8_t *src_bits, unsigned src_pitch, unsigned surf_height) { @@ -291,6 +294,8 @@ static void copy_nv12_gpu_sse4(struct mp_image *dest, uint8_t *src_bits, } } +#pragma GCC pop_options + static struct mp_image *dxva2_retrieve_image(struct lavc_ctx *s, struct mp_image *img) { diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 1a0d504461..ca9ab9e5eb 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -328,9 +328,6 @@ static int init(struct dec_video *vd, const char *decoder) } } - if (ctx->avctx->bit_rate != 0) - vd->bitrate = ctx->avctx->bit_rate; - return 1; } @@ -362,7 +359,6 @@ static void init_avctx(struct dec_video *vd, const char *decoder, AVCodecContext *avctx = ctx->avctx; if (!ctx->avctx) goto error; - avctx->bit_rate = 0; avctx->opaque = vd; avctx->codec_type = AVMEDIA_TYPE_VIDEO; avctx->codec_id = lavc_codec->id; |