mirror of
https://github.com/mpv-player/mpv
synced 2024-12-13 18:36:09 +00:00
fixed scaling and colors with libavcodec (and some comments added)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3692 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
cb02c4f4e4
commit
d892635b8b
55
mencoder.c
55
mencoder.c
@ -807,6 +807,7 @@ case VCODEC_LIBAVCODEC:
|
||||
avcodec_inited=1;
|
||||
}
|
||||
|
||||
#if 1
|
||||
{
|
||||
extern AVCodec *first_avcodec;
|
||||
AVCodec *p = first_avcodec;
|
||||
@ -820,11 +821,11 @@ case VCODEC_LIBAVCODEC:
|
||||
}
|
||||
lavc_venc_codec = p;
|
||||
}
|
||||
|
||||
#else
|
||||
/* XXX: implement this in avcodec (i will send a patch to ffmpeglist) -- alex */
|
||||
// lavc_venc_codec = (AVCodec *)avcodec_find_encoder_by_name(lavc_param_vcodec);
|
||||
lavc_venc_codec = (AVCodec *)avcodec_find_encoder_by_name(lavc_param_vcodec);
|
||||
#endif
|
||||
|
||||
// lavc_venc_codec = (AVCodec *)avcodec_find_encoder(0);
|
||||
if (!lavc_venc_codec)
|
||||
{
|
||||
printf(MSGTR_MissingLAVCcodec, lavc_param_vcodec);
|
||||
@ -833,8 +834,10 @@ case VCODEC_LIBAVCODEC:
|
||||
|
||||
memset(&lavc_venc_context, 0, sizeof(lavc_venc_context));
|
||||
|
||||
lavc_venc_context.width = mux_v->bih->biWidth;
|
||||
lavc_venc_context.height = mux_v->bih->biHeight;
|
||||
// lavc_venc_context.width = mux_v->bih->biWidth;
|
||||
// lavc_venc_context.height = mux_v->bih->biHeight;
|
||||
lavc_venc_context.width = vo_w;
|
||||
lavc_venc_context.height = vo_h;
|
||||
if (lavc_param_vbitrate >= 0) /* != -1 */
|
||||
lavc_venc_context.bit_rate = lavc_param_vbitrate;
|
||||
else
|
||||
@ -844,8 +847,9 @@ case VCODEC_LIBAVCODEC:
|
||||
if (lavc_param_keyint >= 0) /* != -1 */
|
||||
lavc_venc_context.gop_size = lavc_param_keyint;
|
||||
else
|
||||
lavc_venc_context.gop_size = 10; /* default */
|
||||
lavc_venc_context.gop_size = 250; /* default */
|
||||
|
||||
/* ignored by libavcodec? */
|
||||
if (lavc_param_vhq)
|
||||
{
|
||||
printf("High quality encoding selected (non real time)!\n");
|
||||
@ -853,7 +857,12 @@ case VCODEC_LIBAVCODEC:
|
||||
}
|
||||
else
|
||||
lavc_venc_context.flags = 0;
|
||||
// lavc_venc_context.flags |= CODEC_FLAG_QSCALE;
|
||||
|
||||
#if 0
|
||||
/* fixed qscale :p */
|
||||
lavc_venc_context.flags |= CODEC_FLAG_QSCALE;
|
||||
lavc_venc_context.quality = 1;
|
||||
#endif
|
||||
|
||||
if (avcodec_open(&lavc_venc_context, lavc_venc_codec) != 0)
|
||||
{
|
||||
@ -867,15 +876,36 @@ case VCODEC_LIBAVCODEC:
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 1
|
||||
if (out_fmt != IMGFMT_YV12)
|
||||
{
|
||||
printf("Not supported image format! (%s)\n",
|
||||
vo_format_name(out_fmt));
|
||||
return 0; /* FIXME */
|
||||
}
|
||||
|
||||
memset(&lavc_venc_picture, 0, sizeof(lavc_venc_picture));
|
||||
|
||||
{
|
||||
int size = lavc_venc_context.width * lavc_venc_context.height;
|
||||
|
||||
/* Y */ lavc_venc_picture.data[0] = vo_image_ptr;
|
||||
/* U */ lavc_venc_picture.data[2] = lavc_venc_picture.data[0] + size;
|
||||
/* V */ lavc_venc_picture.data[1] = lavc_venc_picture.data[2] + size/4;
|
||||
lavc_venc_picture.linesize[0] = lavc_venc_context.width;
|
||||
lavc_venc_picture.linesize[1] = lavc_venc_context.width / 2;
|
||||
lavc_venc_picture.linesize[2] = lavc_venc_context.width / 2;
|
||||
}
|
||||
#else
|
||||
switch(out_fmt)
|
||||
{
|
||||
case IMGFMT_YV12:
|
||||
lavc_venc_context.pix_fmt = PIX_FMT_YUV420P;
|
||||
break;
|
||||
case IMGFMT_UYVY:
|
||||
#if 0 /* it's faulting :( -- libavcodec's bug! -- alex */
|
||||
case IMGFMT_YUY2: /* or UYVY */
|
||||
lavc_venc_context.pix_fmt = PIX_FMT_YUV422;
|
||||
break;
|
||||
#if 0 /* it's faulting :( -- libavcodec's bug! -- alex */
|
||||
case IMGFMT_BGR24:
|
||||
lavc_venc_context.pix_fmt = PIX_FMT_BGR24;
|
||||
break;
|
||||
@ -892,6 +922,11 @@ case VCODEC_LIBAVCODEC:
|
||||
printf("Using picture format: %s\n", vo_format_name(out_fmt));
|
||||
|
||||
memset(&lavc_venc_picture, 0, sizeof(lavc_venc_picture));
|
||||
|
||||
printf("ahh: avpict_getsize=%d, vo_image_ptr=%d\n", avpicture_get_size(lavc_venc_context.pix_fmt,
|
||||
lavc_venc_context.width, lavc_venc_context.height),
|
||||
vo_h*vo_w*3/2);
|
||||
|
||||
avpicture_fill(&lavc_venc_picture, vo_image_ptr,
|
||||
lavc_venc_context.pix_fmt, lavc_venc_context.width,
|
||||
lavc_venc_context.height);
|
||||
@ -903,6 +938,8 @@ case VCODEC_LIBAVCODEC:
|
||||
printf("%s\n", buf);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
if(sh_audio)
|
||||
|
Loading…
Reference in New Issue
Block a user