Mercurial > mplayer.hg
annotate libmpcodecs/vd_ffmpeg.c @ 36418:155e6100949c
Code changes to avoid additional unnecessary re-inits.
| author | reimar |
|---|---|
| date | Sat, 16 Nov 2013 23:23:46 +0000 |
| parents | 9e68e53481e4 |
| children | b2dfbef1ac29 |
| rev | line source |
|---|---|
|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
1 /* |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
2 * This file is part of MPlayer. |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
3 * |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
7 * (at your option) any later version. |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
8 * |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
12 * GNU General Public License for more details. |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
13 * |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
17 */ |
|
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
30191
diff
changeset
|
18 |
| 4952 | 19 #include <stdio.h> |
| 20 #include <stdlib.h> | |
| 35903 | 21 #include <strings.h> |
| 4952 | 22 #include <assert.h> |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
23 #include <time.h> |
| 4952 | 24 |
| 25 #include "config.h" | |
| 26 #include "mp_msg.h" | |
| 27 #include "help_mp.h" | |
|
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
28 #include "av_opts.h" |
|
33871
30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents:
33870
diff
changeset
|
29 #include "av_helpers.h" |
| 4952 | 30 |
| 21372 | 31 #include "libavutil/common.h" |
| 34523 | 32 #include "libavutil/dict.h" |
| 21457 | 33 #include "libavutil/intreadwrite.h" |
|
36370
3cc8224f3c6c
Set skip_alpha, we currently have no use for alpha values.
reimar
parents:
36361
diff
changeset
|
34 #include "libavutil/opt.h" |
|
21507
fa99b3d31d13
Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents:
21498
diff
changeset
|
35 #include "mpbswap.h" |
| 28527 | 36 #include "fmt-conversion.h" |
| 4952 | 37 |
| 38 #include "vd_internal.h" | |
| 39 | |
| 36322 | 40 #if CONFIG_VDPAU |
| 41 #include "libavcodec/vdpau.h" | |
| 42 #endif | |
| 43 | |
|
30504
cc27da5d7286
Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents:
30421
diff
changeset
|
44 static const vd_info_t info = { |
| 28523 | 45 "FFmpeg's libavcodec codec family", |
| 46 "ffmpeg", | |
| 47 "A'rpi", | |
| 48 "A'rpi, Michael, Alex", | |
| 49 "native codecs" | |
| 4952 | 50 }; |
| 51 | |
| 52 LIBVD_EXTERN(ffmpeg) | |
| 53 | |
| 54 #include "libavcodec/avcodec.h" | |
| 55 | |
|
35719
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
56 #ifndef AV_EF_COMPLIANT |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
57 #define AV_EF_COMPLIANT 0 |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
58 #endif |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
59 |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
60 #ifndef AV_EF_CAREFUL |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
61 #define AV_EF_CAREFUL 0 |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
62 #endif |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
63 |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
64 #ifndef AV_EF_AGGRESSIVE |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
65 #define AV_EF_AGGRESSIVE 0 |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
66 #endif |
|
a11fa641a711
vd_ffmpeg: Define potentially unavailable error resilience values
diego
parents:
35715
diff
changeset
|
67 |
| 30074 | 68 #if AVPALETTE_SIZE > 1024 |
| 69 #error palette too large, adapt libmpcodecs/vf.c:vf_get_image | |
| 70 #endif | |
| 71 | |
| 28412 | 72 #if CONFIG_XVMC |
|
28522
fee39b6b62ea
Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
diego
parents:
28510
diff
changeset
|
73 #include "libavcodec/xvmc.h" |
| 10362 | 74 #endif |
| 75 | |
| 5280 | 76 typedef struct { |
| 77 AVCodecContext *avctx; | |
| 8413 | 78 AVFrame *pic; |
|
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
79 enum AVPixelFormat pix_fmt; |
| 5482 | 80 int do_slices; |
| 6734 | 81 int do_dr1; |
|
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
82 int nonref_dr; ///< allow dr only for non-reference frames |
| 25962 | 83 int vo_initialized; |
|
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
84 int best_csp; |
| 8411 | 85 int qp_stat[32]; |
| 86 double qp_sum; | |
| 87 double inv_qp_sum; | |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
88 int ip_count; |
|
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
89 int b_count; |
|
22277
de3ca43ae51e
reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents:
22222
diff
changeset
|
90 AVRational last_sample_aspect_ratio; |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
91 int palette_sent; |
| 36349 | 92 int use_hwaccel; |
| 5280 | 93 } vd_ffmpeg_ctx; |
| 94 | |
|
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
10471
diff
changeset
|
95 #include "m_option.h" |
|
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
96 |
| 8413 | 97 static int get_buffer(AVCodecContext *avctx, AVFrame *pic); |
| 98 static void release_buffer(AVCodecContext *avctx, AVFrame *pic); | |
|
29914
67b386883561
Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band.
reimar
parents:
29879
diff
changeset
|
99 static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4], |
|
28552
d7e1fd202d85
Get rid of mc_render_slice and use the generic draw_slice instead.
reimar
parents:
28548
diff
changeset
|
100 int y, int type, int height); |
| 6739 | 101 |
|
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
102 static enum AVPixelFormat get_format(struct AVCodecContext *avctx, |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
103 const enum AVPixelFormat *pix_fmt); |
| 10362 | 104 |
| 7722 | 105 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT; |
| 106 static int lavc_param_error_resilience=2; | |
| 107 static int lavc_param_error_concealment=3; | |
| 26395 | 108 static int lavc_param_gray=0; |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
109 static int lavc_param_vstats=0; |
| 7564 | 110 static int lavc_param_idct_algo=0; |
| 8341 | 111 static int lavc_param_debug=0; |
| 11702 | 112 static int lavc_param_vismv=0; |
|
34248
a52c5ff01dcd
vd_ffmpeg: Conditionally declare lavc_param_wait_keyframe to fix warning.
diego
parents:
34240
diff
changeset
|
113 #ifdef CODEC_FLAG2_SHOW_ALL |
|
34161
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
114 static int lavc_param_wait_keyframe=0; |
|
34248
a52c5ff01dcd
vd_ffmpeg: Conditionally declare lavc_param_wait_keyframe to fix warning.
diego
parents:
34240
diff
changeset
|
115 #endif |
| 12670 | 116 static int lavc_param_skip_top=0; |
| 117 static int lavc_param_skip_bottom=0; | |
| 13230 | 118 static int lavc_param_fast=0; |
| 13473 | 119 static int lavc_param_lowres=0; |
|
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
120 static char *lavc_param_lowres_str=NULL; |
| 15986 | 121 static char *lavc_param_skip_loop_filter_str = NULL; |
| 122 static char *lavc_param_skip_idct_str = NULL; | |
| 123 static char *lavc_param_skip_frame_str = NULL; | |
| 17080 | 124 static int lavc_param_threads=1; |
| 17217 | 125 static int lavc_param_bitexact=0; |
|
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
126 static char *lavc_avopt = NULL; |
|
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
127 static enum AVDiscard skip_idct; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
128 static enum AVDiscard skip_frame; |
|
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
129 |
| 31953 | 130 static const mp_image_t mpi_no_picture = |
| 131 { | |
| 132 .type = MP_IMGTYPE_INCOMPLETE | |
| 133 }; | |
| 134 | |
|
25241
bb7c65f2a289
Make m_option_t arrays referenced by cfg-common.h const
reimar
parents:
24854
diff
changeset
|
135 const m_option_t lavc_decode_opts_conf[]={ |
|
33291
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
136 {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
137 {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
| 34524 | 138 {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_GRAY, NULL}, |
|
33291
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
139 {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
140 {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
141 {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
142 {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
143 {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, |
|
34161
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
144 #ifdef CODEC_FLAG2_SHOW_ALL |
| 34524 | 145 {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, 1, NULL}, |
|
34161
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
146 #endif |
|
33291
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
147 {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
148 {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
149 {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
150 {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
151 {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
152 {"skipidct" , &lavc_param_skip_idct_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
153 {"skipframe" , &lavc_param_skip_frame_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
|
34775
c51421660d5e
Allow using up to 16 threads, that should be the maximum safe value.
reimar
parents:
34772
diff
changeset
|
154 {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 16, NULL}, |
|
33291
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
155 {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_BITEXACT, NULL}, |
|
0a865c5a1a7c
Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents:
33260
diff
changeset
|
156 {"o" , &lavc_avopt , CONF_TYPE_STRING , 0, 0, 0, NULL}, |
| 28523 | 157 {NULL, NULL, 0, 0, 0, 0, NULL} |
|
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
158 }; |
|
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
159 |
| 15986 | 160 static enum AVDiscard str2AVDiscard(char *str) { |
| 26694 | 161 if (!str) return AVDISCARD_DEFAULT; |
| 162 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE; | |
| 163 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT; | |
| 164 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF; | |
| 165 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR; | |
| 166 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY; | |
| 167 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL; | |
| 168 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str); | |
| 15986 | 169 return AVDISCARD_DEFAULT; |
| 170 } | |
| 171 | |
| 4952 | 172 // to set/get/query special features/parameters |
| 28525 | 173 static int control(sh_video_t *sh, int cmd, void *arg, ...){ |
|
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
174 vd_ffmpeg_ctx *ctx = sh->context; |
|
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
175 AVCodecContext *avctx = ctx->avctx; |
|
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
176 switch(cmd){ |
|
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
177 case VDCTRL_QUERY_FORMAT: |
| 28523 | 178 { |
| 28525 | 179 int format =(*((int *)arg)); |
| 180 if(format == ctx->best_csp) return CONTROL_TRUE;//supported | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
181 // possible conversions: |
| 28525 | 182 switch(format){ |
| 6739 | 183 case IMGFMT_YV12: |
| 184 case IMGFMT_IYUV: | |
| 185 case IMGFMT_I420: | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
186 // "converted" using pointer/stride modification |
|
32507
97738e6f82dc
Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents:
32488
diff
changeset
|
187 if(ctx->best_csp == IMGFMT_YV12) return CONTROL_TRUE;// u/v swap |
|
97738e6f82dc
Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents:
32488
diff
changeset
|
188 if(ctx->best_csp == IMGFMT_422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
189 break; |
| 28412 | 190 #if CONFIG_XVMC |
| 10452 | 191 case IMGFMT_XVMC_IDCT_MPEG2: |
| 192 case IMGFMT_XVMC_MOCO_MPEG2: | |
| 10471 | 193 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; |
| 10452 | 194 #endif |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
195 } |
|
6873
1206fa765697
colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents:
6869
diff
changeset
|
196 return CONTROL_FALSE; |
| 28523 | 197 } |
|
11977
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
198 case VDCTRL_RESYNC_STREAM: |
|
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11955
diff
changeset
|
199 avcodec_flush_buffers(avctx); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
200 return CONTROL_TRUE; |
|
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18879
diff
changeset
|
201 case VDCTRL_QUERY_UNSEEN_FRAMES: |
|
34298
a15ac2fd7f01
vd_ffmpeg: fix comment typo (sepcified ? specified)
cboesch
parents:
34291
diff
changeset
|
202 // "has_b_frames" contains the (e.g. reorder) delay as specified |
|
34291
e61a652e9cf1
Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents:
34248
diff
changeset
|
203 // in the standard. "delay" contains the libavcodec-specific delay |
|
e61a652e9cf1
Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents:
34248
diff
changeset
|
204 // e.g. due to frame multithreading |
|
e61a652e9cf1
Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.
reimar
parents:
34248
diff
changeset
|
205 return avctx->has_b_frames + avctx->delay + 10; |
| 10362 | 206 } |
| 4952 | 207 return CONTROL_UNKNOWN; |
| 208 } | |
| 209 | |
| 36322 | 210 #if CONFIG_VDPAU |
| 211 static int vdpau_render_wrapper(AVCodecContext *s, AVFrame *f, | |
| 212 const VdpPictureInfo *info, uint32_t count, const VdpBitstreamBuffer *buffers) | |
| 213 { | |
| 214 mp_image_t *mpi = f->opaque; | |
| 215 sh_video_t *sh = s->opaque; | |
| 216 struct vdpau_frame_data data; | |
| 217 uint8_t *planes[4] = {(void *)&data}; | |
| 218 data.render_state = mpi->priv; | |
| 219 data.info = info; | |
| 220 data.bitstream_buffers_used = count; | |
| 221 data.bitstream_buffers = buffers; | |
| 222 mpcodecs_draw_slice(sh, planes, NULL, sh->disp_w, sh->disp_h, 0, 0); | |
| 223 return 0; | |
| 224 } | |
| 225 #endif | |
| 226 | |
| 227 static int pixfmt2imgfmt2(enum AVPixelFormat fmt, enum AVCodecID cid) | |
| 228 { | |
| 229 if (fmt == AV_PIX_FMT_VDPAU) | |
| 230 switch (cid) { | |
| 231 case AV_CODEC_ID_H264: return IMGFMT_VDPAU_H264; | |
| 232 case AV_CODEC_ID_MPEG1VIDEO: return IMGFMT_VDPAU_MPEG1; | |
| 233 case AV_CODEC_ID_MPEG2VIDEO: return IMGFMT_VDPAU_MPEG2; | |
| 234 case AV_CODEC_ID_MPEG4: return IMGFMT_VDPAU_MPEG4; | |
| 235 case AV_CODEC_ID_WMV3: return IMGFMT_VDPAU_WMV3; | |
| 236 case AV_CODEC_ID_VC1: return IMGFMT_VDPAU_VC1; | |
| 237 } | |
| 238 return pixfmt2imgfmt(fmt); | |
| 239 } | |
| 240 | |
| 36326 | 241 |
| 242 /** | |
| 243 * Function to set slice/dr related settings that need to be reset after | |
| 244 * initializing hardware acceleration failed */ | |
| 245 static void set_dr_slice_settings(struct AVCodecContext *avctx, const AVCodec *lavc_codec) | |
| 246 { | |
| 247 sh_video_t *sh = avctx->opaque; | |
| 248 vd_ffmpeg_ctx *ctx = sh->context; | |
| 249 // slice is rather broken with threads, so disable that combination unless | |
| 250 // explicitly requested | |
| 251 int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1); | |
| 252 | |
| 253 ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND); | |
| 254 | |
| 255 ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) && | |
| 256 lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO && | |
| 257 lavc_codec->id != AV_CODEC_ID_H264 && | |
| 36414 | 258 lavc_codec->id != AV_CODEC_ID_HEVC; |
| 36326 | 259 ctx->nonref_dr = 0; |
| 260 // TODO: fix and enable again. This currently causes issues when using filters | |
| 261 // and seeking, usually failing with the "Ran out of numbered images" message, | |
| 262 // but bugzilla #2118 might be related as well. | |
| 263 if (0 && lavc_codec->id == AV_CODEC_ID_H264) { | |
| 264 ctx->do_dr1 = 1; | |
| 265 ctx->nonref_dr = 1; | |
| 266 } | |
| 267 if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) { | |
| 268 ctx->do_slices = ctx->do_dr1 = 0; | |
| 269 } | |
| 270 if(ctx->do_dr1){ | |
| 271 avctx->flags |= CODEC_FLAG_EMU_EDGE; | |
| 272 avctx-> reget_buffer = | |
| 273 avctx-> get_buffer = get_buffer; | |
| 274 avctx->release_buffer = release_buffer; | |
| 275 } else { | |
| 276 avctx->flags &= ~CODEC_FLAG_EMU_EDGE; | |
| 277 avctx-> reget_buffer = avcodec_default_reget_buffer; | |
| 278 avctx-> get_buffer = avcodec_default_get_buffer; | |
| 279 avctx->release_buffer = avcodec_default_release_buffer; | |
| 280 } | |
| 281 avctx->slice_flags = 0; | |
| 282 } | |
| 283 | |
|
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
284 static void set_format_params(struct AVCodecContext *avctx, |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
285 enum AVPixelFormat fmt) |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
286 { |
| 36349 | 287 sh_video_t *sh = avctx->opaque; |
| 288 vd_ffmpeg_ctx *ctx = sh->context; | |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
289 int imgfmt; |
|
30191
c2fc252b0d14
Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents:
30114
diff
changeset
|
290 if (fmt == PIX_FMT_NONE) |
|
c2fc252b0d14
Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents:
30114
diff
changeset
|
291 return; |
| 36349 | 292 ctx->use_hwaccel = fmt == AV_PIX_FMT_VDPAU; |
| 36322 | 293 imgfmt = pixfmt2imgfmt2(fmt, avctx->codec_id); |
| 32488 | 294 if (IMGFMT_IS_HWACCEL(imgfmt)) { |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
295 ctx->do_dr1 = 1; |
|
34824
59bac49bba26
Fix hardware-acceleration broken by nonref_dr support.
reimar
parents:
34820
diff
changeset
|
296 ctx->nonref_dr = 0; |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
297 avctx->get_buffer = get_buffer; |
|
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
298 avctx->release_buffer = release_buffer; |
|
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
299 avctx->reget_buffer = get_buffer; |
|
36417
9e68e53481e4
Display messages that can be confusing only with -v.
reimar
parents:
36416
diff
changeset
|
300 mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ? |
| 36415 | 301 MSGTR_MPCODECS_XVMCAcceleratedMPEG2 : |
| 302 "[VD_FFMPEG] VDPAU accelerated decoding\n"); | |
| 36349 | 303 if (ctx->use_hwaccel) { |
| 36322 | 304 avctx->draw_horiz_band = NULL; |
| 305 avctx->slice_flags = 0; | |
| 306 ctx->do_slices = 0; | |
| 307 } else { | |
| 308 avctx->draw_horiz_band = draw_slice; | |
| 309 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; | |
| 310 ctx->do_slices = 1; | |
| 311 } | |
|
33044
d2b6fbd11f20
Add condition that lets us switch FFmpeg XvMC decoder back from
reimar
parents:
33043
diff
changeset
|
312 } else { |
| 36326 | 313 set_dr_slice_settings(avctx, avctx->codec); |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
314 } |
|
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
315 } |
|
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
316 |
| 4952 | 317 // init driver |
| 318 static int init(sh_video_t *sh){ | |
| 5280 | 319 AVCodecContext *avctx; |
| 320 vd_ffmpeg_ctx *ctx; | |
|
5457
f248c9e86423
config vo only if aspect really changed and width&&height isn't changed (if w||h changes, we set it later)
alex
parents:
5331
diff
changeset
|
321 AVCodec *lavc_codec; |
|
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
322 int lowres_w=0; |
| 34523 | 323 AVDictionary *opts = NULL; |
| 4952 | 324 |
|
31959
f957f330aa6d
Introduce init_avcodec function to avoid duplicated FFmpeg initializations.
diego
parents:
31954
diff
changeset
|
325 init_avcodec(); |
| 5280 | 326 |
| 327 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx)); | |
| 328 if (!ctx) | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
329 return 0; |
| 5280 | 330 memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); |
| 28509 | 331 |
|
31926
45966266392b
Remove pointless casts of avcodec_find_decoder_by_name() return value.
diego
parents:
31541
diff
changeset
|
332 lavc_codec = avcodec_find_decoder_by_name(sh->codec->dll); |
|
5457
f248c9e86423
config vo only if aspect really changed and width&&height isn't changed (if w||h changes, we set it later)
alex
parents:
5331
diff
changeset
|
333 if(!lavc_codec){ |
| 28525 | 334 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll); |
| 21498 | 335 uninit(sh); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
336 return 0; |
| 4952 | 337 } |
| 5482 | 338 |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
339 ctx->ip_count= ctx->b_count= 0; |
| 7444 | 340 |
| 8413 | 341 ctx->pic = avcodec_alloc_frame(); |
| 33933 | 342 ctx->avctx = avcodec_alloc_context3(lavc_codec); |
| 5280 | 343 avctx = ctx->avctx; |
|
28601
88bb92d3c5b4
Set avctx->opaque already at init instead of decode so it can be used in
reimar
parents:
28595
diff
changeset
|
344 avctx->opaque = sh; |
|
29667
8cfbe411de01
Make sure avctx->codec_type and codec_id are set, since libavcodec
reimar
parents:
29401
diff
changeset
|
345 avctx->codec_id = lavc_codec->id; |
| 6739 | 346 |
|
33043
04203ae3000c
Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents:
33042
diff
changeset
|
347 avctx->get_format = get_format; |
| 17217 | 348 avctx->flags|= lavc_param_bitexact; |
| 28509 | 349 |
|
31954
7eaaed7331f3
Set coded_width/coded_height instead of width/height since that's
reimar
parents:
31953
diff
changeset
|
350 avctx->coded_width = sh->disp_w; |
|
7eaaed7331f3
Set coded_width/coded_height instead of width/height since that's
reimar
parents:
31953
diff
changeset
|
351 avctx->coded_height= sh->disp_h; |
|
6265
f49ec39ab0c6
workaround bugs & error resilience ffmpeg decoder options
michael
parents:
5940
diff
changeset
|
352 avctx->workaround_bugs= lavc_param_workaround_bugs; |
|
34546
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
353 switch (lavc_param_error_resilience) { |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
354 case 5: |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
355 avctx->err_recognition |= AV_EF_EXPLODE | AV_EF_COMPLIANT | AV_EF_CAREFUL; |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
356 break; |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
357 case 4: |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
358 case 3: |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
359 avctx->err_recognition |= AV_EF_AGGRESSIVE; |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
360 // Fallthrough |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
361 case 2: |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
362 avctx->err_recognition |= AV_EF_COMPLIANT; |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
363 // Fallthrough |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
364 case 1: |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
365 avctx->err_recognition |= AV_EF_CAREFUL; |
|
123345d17f3a
Translate level-based to flag-based error recognition values.
reimar
parents:
34524
diff
changeset
|
366 } |
| 34524 | 367 lavc_param_gray|= CODEC_FLAG_GRAY; |
|
34161
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
368 #ifdef CODEC_FLAG2_SHOW_ALL |
|
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
369 if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; |
|
64a0c61c6f18
Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents:
34022
diff
changeset
|
370 #endif |
| 13230 | 371 avctx->flags2|= lavc_param_fast; |
| 9547 | 372 avctx->codec_tag= sh->format; |
| 10847 | 373 avctx->stream_codec_tag= sh->video.fccHandler; |
| 7564 | 374 avctx->idct_algo= lavc_param_idct_algo; |
| 7722 | 375 avctx->error_concealment= lavc_param_error_concealment; |
| 8341 | 376 avctx->debug= lavc_param_debug; |
|
17073
177c02c3785f
make -lavdopts debug work again, patch by Jason Tackaberry ( tack AH sault POIS org )
gpoirier
parents:
16963
diff
changeset
|
377 if (lavc_param_debug) |
| 22153 | 378 av_log_set_level(AV_LOG_DEBUG); |
| 11702 | 379 avctx->debug_mv= lavc_param_vismv; |
| 12670 | 380 avctx->skip_top = lavc_param_skip_top; |
| 381 avctx->skip_bottom= lavc_param_skip_bottom; | |
|
14169
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
382 if(lavc_param_lowres_str != NULL) |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
383 { |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
384 sscanf(lavc_param_lowres_str, "%d,%d", &lavc_param_lowres, &lowres_w); |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
385 if(lavc_param_lowres < 1 || lavc_param_lowres > 16 || (lowres_w > 0 && avctx->width < lowres_w)) |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
386 lavc_param_lowres = 0; |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
387 avctx->lowres = lavc_param_lowres; |
|
95dd81b8b9de
conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents:
14118
diff
changeset
|
388 } |
| 15986 | 389 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str); |
| 33292 | 390 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str); |
| 391 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str); | |
|
36370
3cc8224f3c6c
Set skip_alpha, we currently have no use for alpha values.
reimar
parents:
36361
diff
changeset
|
392 av_opt_set_int(avctx, "skip_alpha", 1, 0); |
|
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
393 |
|
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
394 if(lavc_avopt){ |
|
33255
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
395 if (parse_avopts(avctx, lavc_avopt) < 0 && |
|
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
396 (!lavc_codec->priv_class || |
|
54faee206150
Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents:
33235
diff
changeset
|
397 parse_avopts(avctx->priv_data, lavc_avopt) < 0)) { |
| 28525 | 398 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavc_avopt); |
|
26692
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
399 uninit(sh); |
|
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
400 return 0; |
|
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
401 } |
|
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
402 } |
|
0e325c1957f1
AVOptions support for libavcodec based video decoders.
michael
parents:
26395
diff
changeset
|
403 |
|
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
404 skip_idct = avctx->skip_idct; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
405 skip_frame = avctx->skip_frame; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
406 |
| 28525 | 407 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "libavcodec.size: %d x %d\n", avctx->width, avctx->height); |
|
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
408 switch (sh->format) { |
|
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
409 case mmioFOURCC('S','V','Q','3'): |
|
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
410 /* SVQ3 extradata can show up as sh->ImageDesc if demux_mov is used, or |
|
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
411 in the phony AVI header if demux_lavf is used. The first case is |
|
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
412 handled here; the second case falls through to the next section. */ |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
413 if (sh->ImageDesc) { |
| 28525 | 414 avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
415 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 28525 | 416 memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
417 break; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
418 } |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
419 /* fallthrough */ |
|
19278
c41d4672c675
Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents:
19277
diff
changeset
|
420 |
|
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
421 case mmioFOURCC('A','V','R','n'): |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
422 case mmioFOURCC('M','J','P','G'): |
| 5939 | 423 /* AVRn stores huffman table in AVI header */ |
| 424 /* Pegasus MJPEG stores it also in AVI header, but it uses the common | |
| 425 MJPG fourcc :( */ | |
| 32105 | 426 if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih)) |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
427 break; |
| 34523 | 428 av_dict_set(&opts, "extern_huff", "1", 0); |
| 32105 | 429 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
430 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
431 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
| 5939 | 432 |
| 433 #if 0 | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
434 { |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
435 int x; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
436 uint8_t *p = avctx->extradata; |
| 28509 | 437 |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
438 for (x=0; x<avctx->extradata_size; x++) |
| 28525 | 439 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]); |
| 440 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "\n"); | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
441 } |
| 5939 | 442 #endif |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
443 break; |
|
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
444 |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
445 case mmioFOURCC('R', 'V', '1', '0'): |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
446 case mmioFOURCC('R', 'V', '1', '3'): |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
447 case mmioFOURCC('R', 'V', '2', '0'): |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
448 case mmioFOURCC('R', 'V', '3', '0'): |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
449 case mmioFOURCC('R', 'V', '4', '0'): |
| 20920 | 450 if(sh->bih->biSize<sizeof(*sh->bih)+8){ |
|
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
451 /* only 1 packet per frame & sub_id from fourcc */ |
| 20920 | 452 avctx->extradata_size= 8; |
| 453 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 28525 | 454 ((uint32_t *)avctx->extradata)[0] = 0; |
| 455 ((uint32_t *)avctx->extradata)[1] = | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
456 (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000; |
|
7574
87f57e23e301
fixing RV10 streamcopy - detect packet format (simple single frame vs. slices
arpi
parents:
7573
diff
changeset
|
457 } else { |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
458 /* has extra slice header (demux_rm or rm->avi streamcopy) */ |
| 32105 | 459 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
460 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
461 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
462 } |
| 7573 | 463 |
| 7126 | 464 // printf("%X %X %d %d\n", extrahdr[0], extrahdr[1]); |
|
18023
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
465 break; |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
466 |
|
4ca6b585aa58
simplify extradata handling and make passing extradata on the default.
reimar
parents:
18004
diff
changeset
|
467 default: |
| 32105 | 468 if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih)) |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
469 break; |
| 32105 | 470 avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
471 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
472 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
473 break; |
|
7736
b81b0ab0aa40
put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents:
7722
diff
changeset
|
474 } |
|
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
475 |
| 8264 | 476 if(sh->bih) |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
477 avctx->bits_per_coded_sample= sh->bih->biBitCount; |
| 7126 | 478 |
| 36326 | 479 set_dr_slice_settings(avctx, lavc_codec); |
|
33040
a6be6a134ac0
Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents:
33032
diff
changeset
|
480 if(lavc_codec->capabilities & CODEC_CAP_HWACCEL) |
|
a6be6a134ac0
Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents:
33032
diff
changeset
|
481 // HACK around badly placed checks in mpeg_mc_decode_init |
|
a6be6a134ac0
Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents:
33032
diff
changeset
|
482 set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT); |
|
36329
d334e70dc707
Leave it to FFmpeg to disable multithreading with hwaccel.
reimar
parents:
36326
diff
changeset
|
483 avctx->thread_count = lavc_param_threads; |
|
d334e70dc707
Leave it to FFmpeg to disable multithreading with hwaccel.
reimar
parents:
36326
diff
changeset
|
484 avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; |
|
33040
a6be6a134ac0
Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents:
33032
diff
changeset
|
485 |
| 4952 | 486 /* open it */ |
| 34523 | 487 if (avcodec_open2(avctx, lavc_codec, &opts) < 0) { |
| 28525 | 488 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec); |
| 21498 | 489 uninit(sh); |
| 4952 | 490 return 0; |
| 491 } | |
| 34523 | 492 av_dict_free(&opts); |
|
28766
4725b3ebdba3
Add another hack to work-around the currently completely inconsistent way in
reimar
parents:
28732
diff
changeset
|
493 // this is necessary in case get_format was never called and init_vo is |
|
4725b3ebdba3
Add another hack to work-around the currently completely inconsistent way in
reimar
parents:
28732
diff
changeset
|
494 // too late e.g. for H.264 VDPAU |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
495 set_format_params(avctx, avctx->pix_fmt); |
| 28525 | 496 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n"); |
| 497 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12); | |
| 4952 | 498 } |
| 499 | |
| 500 // uninit driver | |
| 501 static void uninit(sh_video_t *sh){ | |
| 5280 | 502 vd_ffmpeg_ctx *ctx = sh->context; |
| 503 AVCodecContext *avctx = ctx->avctx; | |
| 28509 | 504 |
| 33260 | 505 if(lavc_param_vstats && avctx->coded_frame){ |
| 8411 | 506 int i; |
| 507 for(i=1; i<32; i++){ | |
| 28525 | 508 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "QP: %d, count: %d\n", i, ctx->qp_stat[i]); |
| 8411 | 509 } |
| 28525 | 510 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP, |
| 8413 | 511 ctx->qp_sum / avctx->coded_frame->coded_picture_number, |
| 512 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number) | |
| 8411 | 513 ); |
| 514 } | |
| 5280 | 515 |
| 22091 | 516 if (avctx) { |
| 22092 | 517 if (avctx->codec && avcodec_close(avctx) < 0) |
| 28525 | 518 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec); |
| 5939 | 519 |
| 22092 | 520 av_freep(&avctx->extradata); |
| 36322 | 521 av_freep(&avctx->hwaccel_context); |
| 22092 | 522 av_freep(&avctx->slice_offset); |
| 22091 | 523 } |
| 5939 | 524 |
|
14431
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
525 av_freep(&avctx); |
|
0c10f923746e
change malloc and free to av_ variants where needed.
reimar
parents:
14169
diff
changeset
|
526 av_freep(&ctx->pic); |
|
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32507
diff
changeset
|
527 free(ctx); |
| 4952 | 528 } |
| 529 | |
| 5482 | 530 static void draw_slice(struct AVCodecContext *s, |
|
29914
67b386883561
Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band.
reimar
parents:
29879
diff
changeset
|
531 const AVFrame *src, int offset[4], |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
532 int y, int type, int height){ |
| 36322 | 533 mp_image_t *mpi = src->opaque; |
| 28525 | 534 sh_video_t *sh = s->opaque; |
| 36349 | 535 vd_ffmpeg_ctx *ctx = sh->context; |
|
29059
48ba0e64e754
Use MP_MAX_PLANES as size of arrays passed to mpcodecs_draw_slice.
reimar
parents:
28956
diff
changeset
|
536 uint8_t *source[MP_MAX_PLANES]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; |
|
30588
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
537 int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]}; |
| 36073 | 538 if (!src->data[0]) { |
| 539 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called with NULL pointer!\n"); | |
| 540 return; | |
| 541 } | |
| 36349 | 542 if (mpi && ctx->use_hwaccel) { |
| 36322 | 543 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called for VDPAU!\n"); |
| 544 return; | |
| 545 } | |
| 36351 | 546 #if CONFIG_VDPAU |
| 36354 | 547 if (mpi && IMGFMT_IS_VDPAU(mpi->imgfmt)) { |
| 36349 | 548 struct vdpau_render_state *render = mpi->priv; |
| 549 vdpau_render_wrapper(s, src, &render->info, render->bitstream_buffers_used, render->bitstream_buffers); | |
| 550 return; | |
| 551 } | |
| 36351 | 552 #endif |
|
30588
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
553 if (height < 0) |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
554 { |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
555 int i; |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
556 height = -height; |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
557 y -= height; |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
558 for (i = 0; i < MP_MAX_PLANES; i++) |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
559 { |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
560 strides[i] = -strides[i]; |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
561 source[i] -= strides[i]; |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
562 } |
|
4cc35c457d9e
Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents:
30555
diff
changeset
|
563 } |
| 15683 | 564 if (y < sh->disp_h) { |
| 31270 | 565 height = FFMIN(height, sh->disp_h-y); |
| 566 mpcodecs_draw_slice (sh, source, strides, sh->disp_w, height, 0, y); | |
| 15683 | 567 } |
| 5482 | 568 } |
| 4952 | 569 |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
570 static void update_configuration(sh_video_t *sh, enum AVPixelFormat pix_fmt) { |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
571 vd_ffmpeg_ctx *ctx = sh->context; |
| 36318 | 572 AVCodecContext *avctx = ctx->avctx; |
| 36373 | 573 if (!avctx->sample_aspect_ratio.den) { |
| 574 mp_msg(MSGT_DECVIDEO, MSGL_WARN, "FFmpeg bug: Invalid aspect\n"); | |
| 575 avctx->sample_aspect_ratio.den = 1; | |
| 576 } | |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
577 // it is possible another vo buffers to be used after vo config() |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
578 // lavc reset its buffers on width/heigh change but not on aspect change!!! |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
579 if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) || |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
580 pix_fmt != ctx->pix_fmt || |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
581 !ctx->vo_initialized) |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
582 { |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
583 float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
584 ctx->vo_initialized = 0; |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
585 // this is a special-case HACK for MPEG-1/2 VDPAU that uses neither get_format nor |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
586 // sets the value correctly in avcodec_open. |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
587 set_format_params(avctx, pix_fmt); |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
588 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
589 |
|
36316
139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents:
36315
diff
changeset
|
590 // Do not overwrite sh->original_aspect on the first call, |
|
139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents:
36315
diff
changeset
|
591 // if a container aspect is available (which is preferred then). |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
592 // But set it even if the sample aspect did not change, since a |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
593 // resolution change can cause an aspect change even if the |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
594 // _sample_ aspect is unchanged. |
|
36316
139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents:
36315
diff
changeset
|
595 if (sh->original_aspect == 0 || ctx->last_sample_aspect_ratio.den) |
|
139f2b064ef9
Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents:
36315
diff
changeset
|
596 sh->original_aspect = aspect; |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
597 ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio; |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
598 ctx->pix_fmt = pix_fmt; |
| 36322 | 599 ctx->best_csp = pixfmt2imgfmt2(pix_fmt, avctx->codec_id); |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
600 } |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
601 } |
| 10436 | 602 |
|
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
603 static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt) |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
604 { |
| 5280 | 605 vd_ffmpeg_ctx *ctx = sh->context; |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
606 const AVCodecContext *avctx = ctx->avctx; |
|
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
607 int width, height; |
|
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
608 int i; |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
609 |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
610 // avoid initialization for formats not on the supported |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
611 // list in the codecs.conf entry. |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
612 for (i = 0; i < CODECS_MAX_OUTFMT; i++) |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
613 if (sh->codec->outfmt[i] == pixfmt2imgfmt2(pix_fmt, avctx->codec_id)) |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
614 break; |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
615 if (i == CODECS_MAX_OUTFMT) |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
616 return -1; |
| 4952 | 617 |
|
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
618 width = avctx->width; |
|
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
619 height = avctx->height; |
| 15569 | 620 |
| 621 // HACK! | |
| 622 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video. | |
| 623 // use dimensions from BIH to avoid black borders at the right and bottom. | |
| 624 if (sh->bih && sh->ImageDesc) { | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
625 width = sh->bih->biWidth>>lavc_param_lowres; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
626 height = sh->bih->biHeight>>lavc_param_lowres; |
|
15567
c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
henry
parents:
15064
diff
changeset
|
627 } |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
628 if (width != sh->disp_w || height != sh->disp_h) |
|
32603
02830ab7afb7
Reset ctx->vo_initialized to 0 on a resolution change.
reimar
parents:
32592
diff
changeset
|
629 ctx->vo_initialized = 0; |
|
32439
2f1ccd169a7f
Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents:
32378
diff
changeset
|
630 |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
631 update_configuration(sh, pix_fmt); |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
632 if (!ctx->vo_initialized) |
|
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
633 { |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
634 sh->disp_w = width; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
635 sh->disp_h = height; |
| 28525 | 636 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp)) |
| 28523 | 637 return -1; |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
638 ctx->vo_initialized = 1; |
|
5592
b545d56314d2
yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents:
5517
diff
changeset
|
639 } |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
640 return 0; |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
641 } |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
642 |
| 8413 | 643 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ |
| 28525 | 644 sh_video_t *sh = avctx->opaque; |
| 6734 | 645 vd_ffmpeg_ctx *ctx = sh->context; |
| 28525 | 646 mp_image_t *mpi=NULL; |
|
33010
fafbc46915db
Change MP_IMGFLAG_ACCEPT_STRIDE to MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE as various
zuxy
parents:
32768
diff
changeset
|
647 int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE; |
| 6737 | 648 int type= MP_IMGTYPE_IPB; |
|
36143
3c1595fcf004
Update calculation of allocation size for direct rendering.
reimar
parents:
36142
diff
changeset
|
649 int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres)); |
|
3c1595fcf004
Update calculation of allocation size for direct rendering.
reimar
parents:
36142
diff
changeset
|
650 int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres)); |
|
34218
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
651 // special case to handle reget_buffer |
|
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
652 if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE)) |
|
33200
17ed3a57c83c
Allow DR to work with reget_buffer when no buffer_hints are set.
reimar
parents:
33199
diff
changeset
|
653 return 0; |
|
29879
5dbbcdb2fb47
Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents:
29842
diff
changeset
|
654 avcodec_align_dimensions(avctx, &width, &height); |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
655 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); |
| 6738 | 656 |
| 28523 | 657 if (pic->buffer_hints) { |
| 28525 | 658 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); |
| 28523 | 659 type = MP_IMGTYPE_TEMP; |
| 660 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) | |
| 661 flags |= MP_IMGFLAG_READABLE; | |
|
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
662 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE || |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
663 pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
664 ctx->ip_count++; |
|
34218
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
665 type = MP_IMGTYPE_IP; |
| 28523 | 666 flags |= MP_IMGFLAG_PRESERVE; |
| 667 } | |
|
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
668 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? |
| 28523 | 669 MP_IMGFLAG_DRAW_CALLBACK:0; |
|
34218
fb4ff8e46d79
Improve support for reget_buffer, this fixes DR1 with C93 FFmpeg decoder.
reimar
parents:
34216
diff
changeset
|
670 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n"); |
| 28523 | 671 } else { |
| 672 if(!pic->reference){ | |
| 673 ctx->b_count++; | |
|
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
674 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? |
| 28523 | 675 MP_IMGFLAG_DRAW_CALLBACK:0; |
| 676 }else{ | |
| 677 ctx->ip_count++; | |
| 678 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE | |
| 679 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0); | |
| 680 } | |
|
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
681 if(avctx->has_b_frames || ctx->b_count){ |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
682 type= MP_IMGTYPE_IPB; |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
683 }else{ |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
684 type= MP_IMGTYPE_IP; |
|
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
685 } |
| 11420 | 686 } |
| 8339 | 687 |
|
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
688 if (ctx->nonref_dr) { |
| 34864 | 689 if (flags & MP_IMGFLAG_PRESERVE) |
|
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
690 return avcodec_default_get_buffer(avctx, pic); |
| 34864 | 691 // Use NUMBERED since for e.g. TEMP vos assume there will |
| 692 // be no other frames between the get_image and matching put_image. | |
| 693 type = MP_IMGTYPE_NUMBERED; | |
|
34809
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
694 } |
|
ea97bcb28df1
Allow direct rendering for non-reference frames in H.264.
reimar
parents:
34798
diff
changeset
|
695 |
| 28525 | 696 if(init_vo(sh, avctx->pix_fmt) < 0){ |
| 9991 | 697 avctx->release_buffer= avcodec_default_release_buffer; |
| 36315 | 698 goto disable_dr1; |
| 9991 | 699 } |
|
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
700 |
| 32488 | 701 if (IMGFMT_IS_HWACCEL(ctx->best_csp)) { |
| 34861 | 702 type = MP_IMGTYPE_NUMBERED; |
|
35129
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
703 } else if (avctx->has_b_frames) { |
|
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
704 // HACK/TODO: slices currently do not work properly with B-frames, |
|
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
705 // causing out-of-order frames or crashes with e.g. -vf scale,unsharp |
|
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
706 // or -vf screenshot,unsharp. |
|
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
707 flags &= ~MP_IMGFLAG_DRAW_CALLBACK; |
|
ce52aa2b4853
Quick fix for slices not working with some filter combinations.
reimar
parents:
35040
diff
changeset
|
708 } |
|
34240
43b60a64debf
Detect codecs requiring too many references for DR also when they
reimar
parents:
34221
diff
changeset
|
709 if (type == MP_IMGTYPE_IP || type == MP_IMGTYPE_IPB) { |
| 28523 | 710 if(ctx->b_count>1 || ctx->ip_count>2){ |
| 711 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure); | |
| 36315 | 712 goto disable_dr1; |
| 28523 | 713 } |
| 714 | |
| 28525 | 715 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n"); |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
716 } |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
717 |
| 30074 | 718 if (ctx->best_csp == IMGFMT_RGB8 || ctx->best_csp == IMGFMT_BGR8) |
| 719 flags |= MP_IMGFLAG_RGB_PALETTE; | |
|
29879
5dbbcdb2fb47
Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents:
29842
diff
changeset
|
720 mpi= mpcodecs_get_image(sh, type, flags, width, height); |
|
28608
7a759aa746b6
Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handles
reimar
parents:
28601
diff
changeset
|
721 if (!mpi) return -1; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
722 |
| 11000 | 723 // ok, let's see what did we get: |
| 28525 | 724 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
725 !(mpi->flags&MP_IMGFLAG_DIRECT)){ |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
726 // nice, filter/vo likes draw_callback :) |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
727 avctx->draw_horiz_band= draw_slice; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
728 } else |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
729 avctx->draw_horiz_band= NULL; |
| 32488 | 730 if(IMGFMT_IS_HWACCEL(mpi->imgfmt)) { |
|
28582
4d64f83e2fac
Add support for VDPAU video out, including hardware decoding.
reimar
parents:
28573
diff
changeset
|
731 avctx->draw_horiz_band= draw_slice; |
|
4d64f83e2fac
Add support for VDPAU video out, including hardware decoding.
reimar
parents:
28573
diff
changeset
|
732 } |
| 36322 | 733 #if CONFIG_VDPAU |
| 36349 | 734 if (ctx->use_hwaccel) { |
| 36322 | 735 struct vdpau_render_state *render = mpi->priv; |
| 736 AVVDPAUContext *vdpc; | |
| 737 avctx->draw_horiz_band= NULL; | |
| 738 if (!avctx->hwaccel_context) | |
| 739 avctx->hwaccel_context = av_alloc_vdpaucontext(); | |
| 740 vdpc = avctx->hwaccel_context; | |
| 741 vdpc->render2 = vdpau_render_wrapper; | |
| 742 mpi->planes[3] = render->surface; | |
| 743 } | |
| 744 #endif | |
|
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
745 #if CONFIG_XVMC |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
746 if(IMGFMT_IS_XVMC(mpi->imgfmt)) { |
|
28568
1a90167d9f0e
The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.
diego
parents:
28566
diff
changeset
|
747 struct xvmc_pix_fmt *render = mpi->priv; //same as data[2] |
|
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
748 if(!avctx->xvmc_acceleration) { |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
749 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_McGetBufferShouldWorkOnlyWithXVMC); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
750 assert(0); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
751 exit(1); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
752 // return -1;//!!fixme check error conditions in ffmpeg |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
753 } |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
754 if(!(mpi->flags & MP_IMGFLAG_DIRECT)) { |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
755 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
756 assert(0); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
757 exit(1); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
758 // return -1;//!!fixme check error conditions in ffmpeg |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
759 } |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
760 if(mp_msg_test(MSGT_DECVIDEO, MSGL_DBG5)) |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
761 mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::get_buffer (xvmc render=%p)\n", render); |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
762 assert(render != 0); |
|
28573
67d2779b13ec
The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
diego
parents:
28572
diff
changeset
|
763 assert(render->xvmc_id == AV_XVMC_ID); |
|
28556
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
764 } |
|
85d1ab476ad5
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents:
28555
diff
changeset
|
765 #endif |
| 11420 | 766 |
| 8339 | 767 pic->data[0]= mpi->planes[0]; |
| 768 pic->data[1]= mpi->planes[1]; | |
| 769 pic->data[2]= mpi->planes[2]; | |
|
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
770 pic->data[3]= mpi->planes[3]; |
| 8595 | 771 |
| 28509 | 772 #if 0 |
| 8595 | 773 assert(mpi->width >= ((width +align)&(~align))); |
| 774 assert(mpi->height >= ((height+align)&(~align))); | |
| 775 assert(mpi->stride[0] >= mpi->width); | |
|
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
776 if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){ |
|
8586
88f2362f1291
5l - fixed asserts... mpi->width is allocated width, not the effective one
arpi
parents:
8510
diff
changeset
|
777 const int y_size= mpi->stride[0] * (mpi->h-1) + mpi->w; |
|
88f2362f1291
5l - fixed asserts... mpi->width is allocated width, not the effective one
arpi
parents:
8510
diff
changeset
|
778 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1); |
| 28509 | 779 |
|
7051
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
780 assert(mpi->planes[0] > mpi->planes[1] || mpi->planes[0] + y_size <= mpi->planes[1]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
781 assert(mpi->planes[0] > mpi->planes[2] || mpi->planes[0] + y_size <= mpi->planes[2]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
782 assert(mpi->planes[1] > mpi->planes[0] || mpi->planes[1] + c_size <= mpi->planes[0]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
783 assert(mpi->planes[1] > mpi->planes[2] || mpi->planes[1] + c_size <= mpi->planes[2]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
784 assert(mpi->planes[2] > mpi->planes[0] || mpi->planes[2] + c_size <= mpi->planes[0]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
785 assert(mpi->planes[2] > mpi->planes[1] || mpi->planes[2] + c_size <= mpi->planes[1]); |
|
d03fad6123a3
asserts to check buffer size and non overlapingness
michael
parents:
7004
diff
changeset
|
786 } |
| 8595 | 787 #endif |
| 6734 | 788 |
| 8339 | 789 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames |
| 790 * lavc will check that and die with an error message, if its not true | |
| 791 */ | |
| 792 pic->linesize[0]= mpi->stride[0]; | |
| 793 pic->linesize[1]= mpi->stride[1]; | |
| 794 pic->linesize[2]= mpi->stride[2]; | |
|
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
795 pic->linesize[3]= mpi->stride[3]; |
| 6734 | 796 |
|
34929
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
797 pic->width = avctx->width; |
|
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
798 pic->height = avctx->height; |
|
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
799 pic->format = avctx->pix_fmt; |
|
c410ef9752a0
Initialize a few more AVFrame fields to avoid FFmpeg errors.
reimar
parents:
34909
diff
changeset
|
800 |
| 8339 | 801 pic->opaque = mpi; |
|
6742
93bce3460e2a
fallback to slices, if dr1 fails (bug found by kabi)
michael
parents:
6740
diff
changeset
|
802 //printf("%X\n", (int)mpi->planes[0]); |
| 6869 | 803 #if 0 |
| 804 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
| 805 printf("D"); | |
| 806 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) | |
| 807 printf("S"); | |
| 808 else | |
| 809 printf("."); | |
| 810 #endif | |
| 8411 | 811 pic->type= FF_BUFFER_TYPE_USER; |
| 7928 | 812 return 0; |
| 36315 | 813 |
| 814 disable_dr1: | |
| 815 ctx->do_dr1 = 0; | |
| 816 // For frame-multithreading these contexts aren't | |
| 817 // the same and must both be updated. | |
| 818 ctx->avctx->get_buffer = | |
| 819 avctx->get_buffer = avcodec_default_get_buffer; | |
| 820 ctx->avctx->reget_buffer = | |
| 821 avctx->reget_buffer = avcodec_default_reget_buffer; | |
| 822 if (pic->data[0]) | |
| 823 release_buffer(avctx, pic); | |
| 824 return avctx->get_buffer(avctx, pic); | |
| 8339 | 825 } |
| 826 | |
| 8413 | 827 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ |
| 28525 | 828 mp_image_t *mpi= pic->opaque; |
| 829 sh_video_t *sh = avctx->opaque; | |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
830 vd_ffmpeg_ctx *ctx = sh->context; |
| 8339 | 831 int i; |
|
34817
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
832 if (pic->type != FF_BUFFER_TYPE_USER) { |
|
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
833 avcodec_default_release_buffer(avctx, pic); |
|
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
834 return; |
|
326242b21831
Do not return void type and remove broken duplicate code.
reimar
parents:
34816
diff
changeset
|
835 } |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
836 |
| 35260 | 837 if (mpi) { |
| 28509 | 838 //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count); |
|
9982
cd76f332bdee
fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents:
9931
diff
changeset
|
839 |
| 28523 | 840 if(mpi->flags&MP_IMGFLAG_PRESERVE) |
| 841 ctx->ip_count--; | |
| 842 else | |
| 843 ctx->b_count--; | |
| 11420 | 844 |
| 28555 | 845 // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU) |
|
28956
6d0da4fd4544
Allow to use vdpau temporal deinterlacers with hardware accelerated decoding.
cehoyos
parents:
28766
diff
changeset
|
846 mpi->usage_count--; |
| 35040 | 847 if (mpi->usage_count < 0) { |
| 848 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Bad mp_image usage count, please report!\n"); | |
| 849 mpi->usage_count = 0; | |
| 850 } | |
|
28553
81931c7c0cf3
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents:
28552
diff
changeset
|
851 } |
| 11420 | 852 |
| 8339 | 853 for(i=0; i<4; i++){ |
| 854 pic->data[i]= NULL; | |
| 855 } | |
| 856 //printf("R%X %X\n", pic->linesize[0], pic->data[0]); | |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
857 } |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
858 |
| 7573 | 859 // copypaste from demux_real.c - it should match to get it working! |
| 860 //FIXME put into some header | |
| 861 typedef struct dp_hdr_s { | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
862 uint32_t chunks; // number of chunks |
| 7573 | 863 uint32_t timestamp; // timestamp from packet header |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
864 uint32_t len; // length of actual data |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
865 uint32_t chunktab; // offset to chunk offset array |
| 7573 | 866 } dp_hdr_t; |
| 867 | |
|
31520
9f934200bf9e
Replace HAVE_BIGENDIAN #ifdef around swap_palette() by av_unused attribute.
diego
parents:
31518
diff
changeset
|
868 static av_unused void swap_palette(void *pal) |
|
30555
ad6740b58b0d
libmpcodecs: Mark functions not used outside of their files as static.
diego
parents:
30504
diff
changeset
|
869 { |
| 22076 | 870 int i; |
| 871 uint32_t *p = pal; | |
| 872 for (i = 0; i < AVPALETTE_COUNT; i++) | |
| 873 p[i] = le2me_32(p[i]); | |
| 874 } | |
| 13190 | 875 |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
876 // decode a frame |
| 28525 | 877 static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){ |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
878 int got_picture=0; |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
879 int ret; |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
880 vd_ffmpeg_ctx *ctx = sh->context; |
| 8413 | 881 AVFrame *pic= ctx->pic; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
882 AVCodecContext *avctx = ctx->avctx; |
| 28525 | 883 mp_image_t *mpi=NULL; |
| 6737 | 884 int dr1= ctx->do_dr1; |
|
29298
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
885 AVPacket pkt; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
886 |
| 34772 | 887 if(data && len<=0) return NULL; // skipped frame |
| 6734 | 888 |
|
12033
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
889 //ffmpeg interlace (mpeg2) bug have been fixed. no need of -noslices |
|
3dd75c52bf38
use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents:
12006
diff
changeset
|
890 if (!dr1) |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
891 avctx->draw_horiz_band=NULL; |
| 25962 | 892 if(ctx->vo_initialized && !(flags&3) && !dr1){ |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
893 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE | |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
894 (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0), |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
895 sh->disp_w, sh->disp_h); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
896 if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){ |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
897 // vd core likes slices! |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
898 avctx->draw_horiz_band=draw_slice; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
899 } |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
900 } |
|
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
901 |
|
33235
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
902 avctx->skip_idct = skip_idct; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
903 avctx->skip_frame = skip_frame; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
904 |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
905 if (flags&3) { |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
906 avctx->skip_frame = AVDISCARD_NONREF; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
907 if (flags&2) |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
908 avctx->skip_idct = AVDISCARD_ALL; |
|
6e6eac0ea1b4
Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents:
33200
diff
changeset
|
909 } |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
910 |
| 34772 | 911 if (data) |
|
16497
182794778785
print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents:
15986
diff
changeset
|
912 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n", |
|
182794778785
print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents:
15986
diff
changeset
|
913 ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]); |
|
29298
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
914 av_init_packet(&pkt); |
|
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
915 pkt.data = data; |
|
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
916 pkt.size = len; |
|
34948
1c762294183f
Set AV_PKT_FLAG_KEY correctly based on demuxer keyframe flag.
reimar
parents:
34929
diff
changeset
|
917 // Necessary to decode e.g. CorePNG and ZeroCodec correctly |
|
1c762294183f
Set AV_PKT_FLAG_KEY correctly based on demuxer keyframe flag.
reimar
parents:
34929
diff
changeset
|
918 pkt.flags = (sh->ds->flags & 1) ? AV_PKT_FLAG_KEY : 0; |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
919 if (!ctx->palette_sent && sh->bih && sh->bih->biBitCount <= 8) { |
|
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
920 /* Pass palette to codec */ |
|
34313
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
921 uint8_t *pal_data = (uint8_t *)(sh->bih+1); |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
922 unsigned palsize = sh->bih->biSize - sizeof(*sh->bih); |
|
34313
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
923 unsigned needed_size = 4 << sh->bih->biBitCount; |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
924 // Assume palette outside bih in rest of chunk. |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
925 // Fixes samples/V-codecs/QPEG/MITSUMI.AVI |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
926 if (palsize < needed_size && |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
927 sh->bih_size > sh->bih->biSize && |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
928 sh->bih_size - sh->bih->biSize > palsize) { |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
929 pal_data = (uint8_t *)sh->bih + sh->bih->biSize; |
|
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
930 palsize = sh->bih_size - sh->bih->biSize; |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
931 } |
|
34221
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
932 // if still 0, we simply have no palette in extradata. |
|
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
933 if (palsize) { |
|
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
934 uint8_t *pal = av_packet_new_side_data(&pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); |
|
34313
8f2167abd6e0
Try harder to extract a sensible palette from extradata.
reimar
parents:
34309
diff
changeset
|
935 memcpy(pal, pal_data, FFMIN(palsize, AVPALETTE_SIZE)); |
|
34221
12bcb27faa26
Do not create a 0-sized palette side data from extradata.
reimar
parents:
34220
diff
changeset
|
936 } |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
937 ctx->palette_sent = 1; |
|
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
938 } |
|
29298
fb99e3db8f8b
Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents:
29059
diff
changeset
|
939 ret = avcodec_decode_video2(avctx, pic, &got_picture, &pkt); |
|
34021
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
940 pkt.data = NULL; |
|
fbb87f092560
Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents:
33933
diff
changeset
|
941 pkt.size = 0; |
| 36361 | 942 av_packet_free_side_data(&pkt); |
| 13190 | 943 |
| 34813 | 944 // even when we do dr we might actually get a buffer we had |
| 945 // FFmpeg allocate - this mostly happens with nonref_dr. | |
| 946 // Ensure we treat it correctly. | |
| 947 dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER; | |
| 28525 | 948 if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); |
| 9547 | 949 //printf("repeat: %d\n", pic->repeat_pict); |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
950 //-- vstats generation |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
951 while(lavc_param_vstats){ // always one time loop |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
952 static FILE *fvstats=NULL; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
953 char filename[20]; |
|
6834
2d7dfcc79651
Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents:
6833
diff
changeset
|
954 static long long int all_len=0; |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
955 static int frame_number=0; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
956 static double all_frametime=0.0; |
| 8413 | 957 AVFrame *pic= avctx->coded_frame; |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
958 double quality=0.0; |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
959 |
| 33260 | 960 if(!pic) break; |
| 961 | |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
962 if(!fvstats) { |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
963 time_t today2; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
964 struct tm *today; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
965 today2 = time(NULL); |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
966 today = localtime(&today2); |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
967 sprintf(filename, "vstats_%02d%02d%02d.log", today->tm_hour, |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
968 today->tm_min, today->tm_sec); |
| 28525 | 969 fvstats = fopen(filename, "w"); |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
970 if(!fvstats) { |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
971 perror("fopen"); |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
972 lavc_param_vstats=0; // disable block |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
973 break; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
974 /*exit(1);*/ |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
975 } |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
976 } |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
977 |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
978 // average MB quantizer |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
979 { |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
980 int x, y; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
981 int w = ((avctx->width << lavc_param_lowres)+15) >> 4; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
982 int h = ((avctx->height << lavc_param_lowres)+15) >> 4; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
983 int8_t *q = pic->qscale_table; |
| 28525 | 984 for(y = 0; y < h; y++) { |
| 985 for(x = 0; x < w; x++) | |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
986 quality += (double)*(q+x); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
987 q += pic->qstride; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
988 } |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
989 quality /= w * h; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
990 } |
|
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
991 |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
992 all_len+=len; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
993 all_frametime+=sh->frametime; |
| 8411 | 994 fprintf(fvstats, "frame= %5d q= %2.2f f_size= %6d s_size= %8.0fkB ", |
|
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
995 ++frame_number, quality, len, (double)all_len/1024); |
|
6833
a709a7662cd1
Add type= and fix a minor typing difference from ffmpeg
atmos4
parents:
6828
diff
changeset
|
996 fprintf(fvstats, "time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
997 all_frametime, (double)(len*8)/sh->frametime/1000.0, |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
998 (double)(all_len*8)/all_frametime/1000.0); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
999 switch(pic->pict_type){ |
| 34521 | 1000 case AV_PICTURE_TYPE_I: |
|
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1001 fprintf(fvstats, "type= I\n"); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1002 break; |
| 34521 | 1003 case AV_PICTURE_TYPE_P: |
|
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1004 fprintf(fvstats, "type= P\n"); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1005 break; |
| 34521 | 1006 case AV_PICTURE_TYPE_S: |
|
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1007 fprintf(fvstats, "type= S\n"); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1008 break; |
| 34521 | 1009 case AV_PICTURE_TYPE_B: |
|
8065
a3e7c0e16d5b
fixing vstats so B frames are shown as B and not P
michael
parents:
7984
diff
changeset
|
1010 fprintf(fvstats, "type= B\n"); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1011 break; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1012 default: |
|
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1013 fprintf(fvstats, "type= ? (%d)\n", pic->pict_type); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1014 break; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1015 } |
| 28509 | 1016 |
|
9865
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1017 ctx->qp_stat[(int)(quality+0.5)]++; |
|
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1018 ctx->qp_sum += quality; |
|
30893b593947
Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents:
9547
diff
changeset
|
1019 ctx->inv_qp_sum += 1.0/(double)quality; |
| 28509 | 1020 |
|
6828
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1021 break; |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1022 } |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1023 //-- |
|
010be15e48ad
Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents:
6771
diff
changeset
|
1024 |
| 31953 | 1025 if(!got_picture) { |
|
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35707
diff
changeset
|
1026 if (avctx->codec->id == AV_CODEC_ID_H264 && |
| 34909 | 1027 skip_frame <= AVDISCARD_DEFAULT) |
| 31953 | 1028 return &mpi_no_picture; // H.264 first field only |
| 1029 else | |
| 1030 return NULL; // skipped image | |
| 1031 } | |
| 6738 | 1032 |
| 28525 | 1033 if(init_vo(sh, avctx->pix_fmt) < 0) return NULL; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
1034 |
| 8339 | 1035 if(dr1 && pic->opaque){ |
| 36141 | 1036 mpi=pic->opaque; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
1037 } |
| 28509 | 1038 |
| 5482 | 1039 if(!mpi) |
| 4952 | 1040 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE, |
|
34309
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1041 pic->width, pic->height); |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1042 if(!mpi){ // temporary! |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1043 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_CouldntAllocateImageForCodec); |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1044 return NULL; |
| 4952 | 1045 } |
| 28509 | 1046 |
| 36142 | 1047 if (mpi->w != avctx->width || mpi->h != avctx->height || |
| 1048 pic->width < mpi->w || pic->height < mpi->h) { | |
| 36140 | 1049 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Dropping frame with size not matching configured size (%ix%i vs %ix%i vs %ix%i)\n", |
| 1050 mpi->w, mpi->h, pic->width, pic->height, avctx->width, avctx->height); | |
|
34309
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1051 return NULL; |
|
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1052 } |
|
119af6360b00
Discard frames where the size does not match the AVCodecContext width/height.
reimar
parents:
34298
diff
changeset
|
1053 |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
1054 if(!dr1){ |
| 8339 | 1055 mpi->planes[0]=pic->data[0]; |
| 1056 mpi->planes[1]=pic->data[1]; | |
| 1057 mpi->planes[2]=pic->data[2]; | |
|
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
1058 mpi->planes[3]=pic->data[3]; |
| 8339 | 1059 mpi->stride[0]=pic->linesize[0]; |
| 1060 mpi->stride[1]=pic->linesize[1]; | |
| 1061 mpi->stride[2]=pic->linesize[2]; | |
|
30114
7470ba76f228
Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents:
30074
diff
changeset
|
1062 mpi->stride[3]=pic->linesize[3]; |
|
6733
3b1f37fc0693
direct rendering method 1 (disabled currently as its not bugfree / finished yet, just set dr1=1 if u want to try it)
michael
parents:
6710
diff
changeset
|
1063 } |
| 28509 | 1064 |
|
11372
3761aff4722e
If alex is too lazy to apply a patch, then i'll do it :)
attila
parents:
11194
diff
changeset
|
1065 if (!mpi->planes[0]) |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1066 return NULL; |
| 4952 | 1067 |
|
32507
97738e6f82dc
Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents:
32488
diff
changeset
|
1068 if(ctx->best_csp == IMGFMT_422P && mpi->chroma_y_shift==1){ |
|
28508
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1069 // we have 422p but user wants 420p |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1070 mpi->stride[1]*=2; |
|
c475b032694f
Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents:
28507
diff
changeset
|
1071 mpi->stride[2]*=2; |
| 4952 | 1072 } |
| 28509 | 1073 |
|
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29298
diff
changeset
|
1074 #if HAVE_BIGENDIAN |
| 22076 | 1075 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE |
| 1076 if (mpi->bpp == 8) | |
| 1077 swap_palette(mpi->planes[1]); | |
| 1078 #endif | |
| 6665 | 1079 /* to comfirm with newer lavc style */ |
| 8339 | 1080 mpi->qscale =pic->qscale_table; |
| 1081 mpi->qstride=pic->qstride; | |
| 1082 mpi->pict_type=pic->pict_type; | |
|
9925
420640a0f6d0
passing qscale_type around so the pp code can fix the mpeg2 <<1 thing
michael
parents:
9865
diff
changeset
|
1083 mpi->qscale_type= pic->qscale_type; |
|
11669
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
1084 mpi->fields = MP_IMGFIELD_ORDERED; |
|
bcf9862f61b2
set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents:
11541
diff
changeset
|
1085 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED; |
| 28509 | 1086 if(pic->top_field_first ) mpi->fields |= MP_IMGFIELD_TOP_FIRST; |
|
11992
d8890a065727
vd_ffmpeg to set repeat-first-field patch by (Zoltan Hidvegi <mplayer at hzoli do 2y dot net>)
michael
parents:
11977
diff
changeset
|
1087 if(pic->repeat_pict == 1) mpi->fields |= MP_IMGFIELD_REPEAT_FIRST; |
|
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
18917
diff
changeset
|
1088 |
| 4952 | 1089 return mpi; |
| 1090 } | |
| 1091 | |
|
35707
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1092 static enum AVPixelFormat get_format(struct AVCodecContext *avctx, |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1093 const enum AVPixelFormat *fmt) |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1094 { |
|
4ba6b8d3197e
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
diego
parents:
35615
diff
changeset
|
1095 enum AVPixelFormat selected_format; |
|
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1096 int imgfmt; |
| 28525 | 1097 sh_video_t *sh = avctx->opaque; |
|
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1098 vd_ffmpeg_ctx *ctx = sh->context; |
| 28523 | 1099 int i; |
| 12006 | 1100 |
|
36418
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1101 // Try to select identical format to avoid reinitializations |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1102 if (ctx->vo_initialized && ctx->pix_fmt != AV_PIX_FMT_NONE) |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1103 for (i = 0; fmt[i] != AV_PIX_FMT_NONE; i++) |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1104 if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt; |
|
155e6100949c
Code changes to avoid additional unnecessary re-inits.
reimar
parents:
36417
diff
changeset
|
1105 |
|
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1106 for(i=0;fmt[i]!=PIX_FMT_NONE;i++){ |
|
36353
46bc86e725af
Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents:
36351
diff
changeset
|
1107 // it is incorrect of FFmpeg to even offer these, filter them out |
|
46bc86e725af
Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents:
36351
diff
changeset
|
1108 if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && |
|
46bc86e725af
Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents:
36351
diff
changeset
|
1109 (fmt[i] == AV_PIX_FMT_VDPAU_MPEG1 || fmt[i] == AV_PIX_FMT_VDPAU_MPEG2)) |
|
46bc86e725af
Add hack/workaround for FFmpeg offering pixfmts not valid
reimar
parents:
36351
diff
changeset
|
1110 continue; |
| 36322 | 1111 imgfmt = pixfmt2imgfmt2(fmt[i], avctx->codec_id); |
| 32488 | 1112 if(!IMGFMT_IS_HWACCEL(imgfmt)) continue; |
|
36417
9e68e53481e4
Display messages that can be confusing only with -v.
reimar
parents:
36416
diff
changeset
|
1113 mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_MPCODECS_TryingPixfmt, i); |
|
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1114 if(init_vo(sh, fmt[i]) >= 0) { |
|
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1115 break; |
|
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1116 } |
|
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1117 } |
|
28627
c327b2e9b259
Return PIX_FMT_NONE if the video system refuses all other formats.
iive
parents:
28608
diff
changeset
|
1118 selected_format = fmt[i]; |
|
36075
b14ea6320969
Ensure we call init_vo at the end of get_format to ensure the vo is properly initialized.
reimar
parents:
36073
diff
changeset
|
1119 if (selected_format == PIX_FMT_NONE) { |
|
33043
04203ae3000c
Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents:
33042
diff
changeset
|
1120 selected_format = avcodec_default_get_format(avctx, fmt); |
|
36149
f69d9caa3d84
Split init_vo and call only the necessary part from get_buffer.
reimar
parents:
36143
diff
changeset
|
1121 update_configuration(sh, selected_format); |
|
36075
b14ea6320969
Ensure we call init_vo at the end of get_format to ensure the vo is properly initialized.
reimar
parents:
36073
diff
changeset
|
1122 } |
|
28731
244353700b38
Create a set_format_params function that sets all the special options needed
reimar
parents:
28627
diff
changeset
|
1123 set_format_params(avctx, selected_format); |
|
28564
f2f0357b2c30
Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents:
28563
diff
changeset
|
1124 return selected_format; |
| 12006 | 1125 } |
