annotate libmpcodecs/vd_ffmpeg.c @ 34161:64a0c61c6f18

Add a vd_ffmpeg option to make the decoder discard frames until the first keyframe after startup or seek. Restore the previous default behaviour since in actual playback scenarios long delays are far more annoying than seeing a few broken frames.
author reimar
date Mon, 24 Oct 2011 17:44:13 +0000
parents fab5ae1132e7
children 66cdad95f543
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
19 #include <stdio.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
20 #include <stdlib.h>
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
21 #include <assert.h>
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
22 #include <time.h>
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
23
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
24 #include "config.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
25 #include "mp_msg.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
26 #include "help_mp.h"
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
27 #include "av_opts.h"
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33870
diff changeset
28 #include "av_helpers.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
29
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 21251
diff changeset
30 #include "libavutil/common.h"
21457
af4c8fd34494 Compile fix, BE_32 definition has been moved
reimar
parents: 21372
diff changeset
31 #include "libavutil/intreadwrite.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21498
diff changeset
32 #include "mpbswap.h"
28527
90da3cbfbdd9 Use fmt-conversion.h in vd_ffmpeg.c
reimar
parents: 28525
diff changeset
33 #include "fmt-conversion.h"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
34
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
35 #include "vd_internal.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
36
30504
cc27da5d7286 Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents: 30421
diff changeset
37 static const vd_info_t info = {
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
38 "FFmpeg's libavcodec codec family",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
39 "ffmpeg",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
40 "A'rpi",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
41 "A'rpi, Michael, Alex",
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
42 "native codecs"
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
43 };
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
44
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
45 LIBVD_EXTERN(ffmpeg)
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
46
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
47 #include "libavcodec/avcodec.h"
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
48
30074
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
49 #if AVPALETTE_SIZE > 1024
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
50 #error palette too large, adapt libmpcodecs/vf.c:vf_get_image
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
51 #endif
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
52
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
53 #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
54 #include "libavcodec/xvmc.h"
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
55 #endif
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
56
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
57 typedef struct {
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
58 AVCodecContext *avctx;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
59 AVFrame *pic;
17973
75442247ee56 reinit vo when pix_fmt changes.
reimar
parents: 17932
diff changeset
60 enum PixelFormat pix_fmt;
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
61 int do_slices;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
62 int do_dr1;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
63 int vo_initialized;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
64 int best_csp;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
65 int b_age;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
66 int ip_age[2];
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
67 int qp_stat[32];
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
68 double qp_sum;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
69 double inv_qp_sum;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
70 int ip_count;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
71 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
72 AVRational last_sample_aspect_ratio;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
73 int palette_sent;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
74 } vd_ffmpeg_ctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
75
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
76 #include "m_option.h"
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
77
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
78 static int get_buffer(AVCodecContext *avctx, AVFrame *pic);
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
79 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
80 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
81 int y, int type, int height);
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
82
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
83 static enum PixelFormat get_format(struct AVCodecContext *avctx,
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
84 const enum PixelFormat *pix_fmt);
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
85
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
86 static int lavc_param_workaround_bugs= FF_BUG_AUTODETECT;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
87 static int lavc_param_error_resilience=2;
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
88 static int lavc_param_error_concealment=3;
26395
71bd93e71a97 Restore grayscale decoding support with FFmpeg.
diego
parents: 26166
diff changeset
89 static int lavc_param_gray=0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
90 static int lavc_param_vstats=0;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
91 static int lavc_param_idct_algo=0;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
92 static int lavc_param_debug=0;
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
93 static int lavc_param_vismv=0;
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
94 static int lavc_param_wait_keyframe=0;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
95 static int lavc_param_skip_top=0;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
96 static int lavc_param_skip_bottom=0;
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
97 static int lavc_param_fast=0;
13473
daeea32a0956 low resolution decoding
michael
parents: 13333
diff changeset
98 static int lavc_param_lowres=0;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
99 static char *lavc_param_lowres_str=NULL;
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
100 static char *lavc_param_skip_loop_filter_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
101 static char *lavc_param_skip_idct_str = NULL;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
102 static char *lavc_param_skip_frame_str = NULL;
17080
b3ef98ca8677 multithreaded decoding
michael
parents: 17073
diff changeset
103 static int lavc_param_threads=1;
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
104 static int lavc_param_bitexact=0;
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
105 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
106 static enum AVDiscard skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
107 static enum AVDiscard skip_frame;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
108
31953
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
109 static const mp_image_t mpi_no_picture =
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
110 {
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
111 .type = MP_IMGTYPE_INCOMPLETE
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
112 };
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
113
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 24854
diff changeset
114 const m_option_t lavc_decode_opts_conf[]={
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
115 {"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
116 {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
117 {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_PART, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
118 {"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
119 {"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
120 {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
121 {"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
122 {"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
123 #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
124 {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_PART, NULL},
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
125 #endif
33291
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
126 {"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
127 {"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
128 {"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
129 {"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
130 {"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
131 {"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
132 {"skipframe" , &lavc_param_skip_frame_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
133 {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 8, NULL},
0a865c5a1a7c Vertical alignment / test mplayer-gitsvn @ mplayerhq.hu
michael
parents: 33260
diff changeset
134 {"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
135 {"o" , &lavc_avopt , CONF_TYPE_STRING , 0, 0, 0, NULL},
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
136 {NULL, NULL, 0, 0, 0, 0, NULL}
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
137 };
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
138
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
139 static enum AVDiscard str2AVDiscard(char *str) {
26694
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
140 if (!str) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
141 if (strcasecmp(str, "none" ) == 0) return AVDISCARD_NONE;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
142 if (strcasecmp(str, "default") == 0) return AVDISCARD_DEFAULT;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
143 if (strcasecmp(str, "nonref" ) == 0) return AVDISCARD_NONREF;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
144 if (strcasecmp(str, "bidir" ) == 0) return AVDISCARD_BIDIR;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
145 if (strcasecmp(str, "nonkey" ) == 0) return AVDISCARD_NONKEY;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
146 if (strcasecmp(str, "all" ) == 0) return AVDISCARD_ALL;
75ec8833185c Reformat very ugly code.
michael
parents: 26692
diff changeset
147 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unknown discard value %s\n", str);
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
148 return AVDISCARD_DEFAULT;
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
149 }
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
150
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
151 // to set/get/query special features/parameters
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
152 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
153 vd_ffmpeg_ctx *ctx = sh->context;
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
154 AVCodecContext *avctx = ctx->avctx;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
155 switch(cmd){
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
156 case VDCTRL_QUERY_FORMAT:
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
157 {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
158 int format =(*((int *)arg));
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
159 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
160 // possible conversions:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
161 switch(format){
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
162 case IMGFMT_YV12:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
163 case IMGFMT_IYUV:
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
164 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
165 // "converted" using pointer/stride modification
32507
97738e6f82dc Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents: 32488
diff changeset
166 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
167 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
168 break;
28412
5e5e9962a96d Convert CONFIG_XVMC into a 0/1 definition.
zuxy
parents: 28299
diff changeset
169 #if CONFIG_XVMC
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
170 case IMGFMT_XVMC_IDCT_MPEG2:
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
171 case IMGFMT_XVMC_MOCO_MPEG2:
10471
8672c6119e2c xvmc updates
iive
parents: 10452
diff changeset
172 if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE;
10452
4eaf6fa120b1 sync to ffmpeg, updates, cleanups
iive
parents: 10449
diff changeset
173 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
174 }
6873
1206fa765697 colorspace part cleanup and support for IMGFMT_422P, _444P
arpi
parents: 6869
diff changeset
175 return CONTROL_FALSE;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
176 }
11977
efb37725d616 flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents: 11955
diff changeset
177 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
178 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
179 return CONTROL_TRUE;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18879
diff changeset
180 case VDCTRL_QUERY_UNSEEN_FRAMES:
33152
0c2838570652 Revert r33231, FFmpeg already sets has_b_frames up this way for
reimar
parents: 33144
diff changeset
181 // has_b_frames includes delay due to frame-multithreading
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
182 return avctx->has_b_frames + 10;
10362
8e3e884ec8a4 xvmc support
iive
parents: 10162
diff changeset
183 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
184 return CONTROL_UNKNOWN;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
185 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
186
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
187 static void set_format_params(struct AVCodecContext *avctx, enum PixelFormat fmt){
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
188 int imgfmt;
30191
c2fc252b0d14 Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents: 30114
diff changeset
189 if (fmt == PIX_FMT_NONE)
c2fc252b0d14 Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
zuxy
parents: 30114
diff changeset
190 return;
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
191 imgfmt = pixfmt2imgfmt(fmt);
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
192 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
193 sh_video_t *sh = avctx->opaque;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
194 vd_ffmpeg_ctx *ctx = sh->context;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
195 ctx->do_dr1 = 1;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
196 ctx->do_slices = 1;
33041
bf51474ed3fe Attempt to fix crashes with VDPAU and threads.
reimar
parents: 33040
diff changeset
197 // HACK: FFmpeg thread handling is a major mess and
bf51474ed3fe Attempt to fix crashes with VDPAU and threads.
reimar
parents: 33040
diff changeset
198 // hinders any attempt to decide on hwaccel after the
bf51474ed3fe Attempt to fix crashes with VDPAU and threads.
reimar
parents: 33040
diff changeset
199 // codec is open. We really want this to change, so
bf51474ed3fe Attempt to fix crashes with VDPAU and threads.
reimar
parents: 33040
diff changeset
200 // just beat it until it's dead
28732
5a8aa763f889 10l, replace a tab that slipped in.
reimar
parents: 28731
diff changeset
201 avctx->thread_count = 1;
33041
bf51474ed3fe Attempt to fix crashes with VDPAU and threads.
reimar
parents: 33040
diff changeset
202 avctx->active_thread_type = 0;
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
203 avctx->get_buffer = get_buffer;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
204 avctx->release_buffer = release_buffer;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
205 avctx->reget_buffer = get_buffer;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
206 avctx->draw_horiz_band = draw_slice;
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
207 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2);
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
208 avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
33044
d2b6fbd11f20 Add condition that lets us switch FFmpeg XvMC decoder back from
reimar
parents: 33043
diff changeset
209 } else {
d2b6fbd11f20 Add condition that lets us switch FFmpeg XvMC decoder back from
reimar
parents: 33043
diff changeset
210 avctx->slice_flags &= ~(SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD);
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
211 }
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
212 }
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
213
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
214 // init driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
215 static int init(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
216 AVCodecContext *avctx;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
217 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
218 AVCodec *lavc_codec;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
219 int lowres_w=0;
11712
5905aae865c7 disable dr1&slices for the other vissualizations too
michael
parents: 11711
diff changeset
220 int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP));
33032
dba2e7218893 Disable the combination of slices and multithreaded decode by default, it
reimar
parents: 33028
diff changeset
221 // slice is rather broken with threads, so disable that combination unless
dba2e7218893 Disable the combination of slices and multithreaded decode by default, it
reimar
parents: 33028
diff changeset
222 // explicitly requested
dba2e7218893 Disable the combination of slices and multithreaded decode by default, it
reimar
parents: 33028
diff changeset
223 int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
224
31959
f957f330aa6d Introduce init_avcodec function to avoid duplicated FFmpeg initializations.
diego
parents: 31954
diff changeset
225 init_avcodec();
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
226
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
227 ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
228 if (!ctx)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
229 return 0;
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
230 memset(ctx, 0, sizeof(vd_ffmpeg_ctx));
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
231
31926
45966266392b Remove pointless casts of avcodec_find_decoder_by_name() return value.
diego
parents: 31541
diff changeset
232 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
233 if(!lavc_codec){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
234 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
235 uninit(sh);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
236 return 0;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
237 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
238
33032
dba2e7218893 Disable the combination of slices and multithreaded decode by default, it
reimar
parents: 33028
diff changeset
239 if(use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
240 ctx->do_slices=1;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
241
32686
cf80c8f31a1b Enable fflagarith video decoder.
cehoyos
parents: 32613
diff changeset
242 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
243 ctx->do_dr1=1;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
244 ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
245 ctx->ip_count= ctx->b_count= 0;
7444
56a16bd12b79 use avcodec_alloc_context()
michael
parents: 7388
diff changeset
246
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
247 ctx->pic = avcodec_alloc_frame();
33933
a5f1aaf21790 Replace several deprecated functions.
reimar
parents: 33871
diff changeset
248 ctx->avctx = avcodec_alloc_context3(lavc_codec);
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
249 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
250 avctx->opaque = sh;
29667
8cfbe411de01 Make sure avctx->codec_type and codec_id are set, since libavcodec
reimar
parents: 29401
diff changeset
251 avctx->codec_id = lavc_codec->id;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
252
33043
04203ae3000c Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents: 33042
diff changeset
253 avctx->get_format = get_format;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
254 if(ctx->do_dr1){
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
255 avctx->flags|= CODEC_FLAG_EMU_EDGE;
33188
d5406d5a0aec Pointless vertical alignment cosmetics to test repository write.
michael
parents: 33168
diff changeset
256 avctx-> get_buffer= get_buffer;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
257 avctx->release_buffer= release_buffer;
33188
d5406d5a0aec Pointless vertical alignment cosmetics to test repository write.
michael
parents: 33168
diff changeset
258 avctx-> reget_buffer= get_buffer;
6739
8a680d5f3a17 10l (init flags after init ...)
michael
parents: 6738
diff changeset
259 }
7303
e805ef05536c fixing mpeg in avi
michael
parents: 7220
diff changeset
260
17217
0d8eee43f85c bitexact flag
michael
parents: 17080
diff changeset
261 avctx->flags|= lavc_param_bitexact;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
262
31954
7eaaed7331f3 Set coded_width/coded_height instead of width/height since that's
reimar
parents: 31953
diff changeset
263 avctx->coded_width = sh->disp_w;
7eaaed7331f3 Set coded_width/coded_height instead of width/height since that's
reimar
parents: 31953
diff changeset
264 avctx->coded_height= sh->disp_h;
6265
f49ec39ab0c6 workaround bugs & error resilience ffmpeg decoder options
michael
parents: 5940
diff changeset
265 avctx->workaround_bugs= lavc_param_workaround_bugs;
27517
af91c1e34603 fix compilation with lavc version > r15270
gpoirier
parents: 27516
diff changeset
266 avctx->error_recognition= lavc_param_error_resilience;
26395
71bd93e71a97 Restore grayscale decoding support with FFmpeg.
diego
parents: 26166
diff changeset
267 if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;
34161
64a0c61c6f18 Add a vd_ffmpeg option to make the decoder discard frames until the first
reimar
parents: 34022
diff changeset
268 #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
269 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
270 #endif
13230
a83623b3b86a non spec compliant optizations support
michael
parents: 13190
diff changeset
271 avctx->flags2|= lavc_param_fast;
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
272 avctx->codec_tag= sh->format;
10847
98dc548dbf2d pass stream header FCC
michael
parents: 10774
diff changeset
273 avctx->stream_codec_tag= sh->video.fccHandler;
7564
24165f770c0d idct algo selection support
michael
parents: 7512
diff changeset
274 avctx->idct_algo= lavc_param_idct_algo;
7722
a181875e0aa8 new error resilience support
michael
parents: 7662
diff changeset
275 avctx->error_concealment= lavc_param_error_concealment;
8341
fd670708f87f specific debug output support
michael
parents: 8340
diff changeset
276 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
277 if (lavc_param_debug)
22153
0cf24df5d97b Revert part of commit r22170.
iive
parents: 22152
diff changeset
278 av_log_set_level(AV_LOG_DEBUG);
11702
e4c043ebf3a6 vismv, alt, ilme options
michael
parents: 11669
diff changeset
279 avctx->debug_mv= lavc_param_vismv;
12670
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
280 avctx->skip_top = lavc_param_skip_top;
aebedab0ecac top/bottom mb row skipping
michael
parents: 12534
diff changeset
281 avctx->skip_bottom= lavc_param_skip_bottom;
14169
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
282 if(lavc_param_lowres_str != NULL)
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
283 {
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
284 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
285 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
286 lavc_param_lowres = 0;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
287 avctx->lowres = lavc_param_lowres;
95dd81b8b9de conditional lowres: activate lowres if frame width >= threshold
nicodvb
parents: 14118
diff changeset
288 }
15986
999f16654819 Support for skip options
reimar
parents: 15823
diff changeset
289 avctx->skip_loop_filter = str2AVDiscard(lavc_param_skip_loop_filter_str);
33292
91464ba53528 cometics / align str2AVDiscard()
michael
parents: 33291
diff changeset
290 avctx->skip_idct = str2AVDiscard(lavc_param_skip_idct_str);
91464ba53528 cometics / align str2AVDiscard()
michael
parents: 33291
diff changeset
291 avctx->skip_frame = str2AVDiscard(lavc_param_skip_frame_str);
26692
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
292
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
293 if(lavc_avopt){
33255
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
294 if (parse_avopts(avctx, lavc_avopt) < 0 &&
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
295 (!lavc_codec->priv_class ||
54faee206150 Command Line Options: Support FFmpeg per-codec AVOptions.
philipl
parents: 33235
diff changeset
296 parse_avopts(avctx->priv_data, lavc_avopt) < 0)) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
297 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
298 uninit(sh);
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
299 return 0;
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
300 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
301 }
0e325c1957f1 AVOptions support for libavcodec based video decoders.
michael
parents: 26395
diff changeset
302
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
303 skip_idct = avctx->skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
304 skip_frame = avctx->skip_frame;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
305
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
306 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
307 switch (sh->format) {
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
308 case mmioFOURCC('S','V','Q','3'):
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
309 /* 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
310 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
311 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
312 if (sh->ImageDesc) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
313 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
314 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
315 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
316 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
317 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
318 /* fallthrough */
19278
c41d4672c675 Fix SVQ3 extradata handling so it works correctly with demux_lavf
pacman
parents: 19277
diff changeset
319
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
320 case mmioFOURCC('A','V','R','n'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
321 case mmioFOURCC('M','J','P','G'):
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
322 /* AVRn stores huffman table in AVI header */
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
323 /* Pegasus MJPEG stores it also in AVI header, but it uses the common
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
324 MJPG fourcc :( */
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
325 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
326 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
327 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
328 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
329 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
330 memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
331
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
332 #if 0
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
333 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
334 int x;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
335 uint8_t *p = avctx->extradata;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
336
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
337 for (x=0; x<avctx->extradata_size; x++)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
338 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "[%x] ", p[x]);
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
339 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
340 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
341 #endif
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
342 break;
18023
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
343
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
344 case mmioFOURCC('R', 'V', '1', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
345 case mmioFOURCC('R', 'V', '1', '3'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
346 case mmioFOURCC('R', 'V', '2', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
347 case mmioFOURCC('R', 'V', '3', '0'):
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
348 case mmioFOURCC('R', 'V', '4', '0'):
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
349 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
350 /* only 1 packet per frame & sub_id from fourcc */
20920
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
351 avctx->extradata_size= 8;
94b1a797661f Fix extradata passing to lavc RV20 decoder
rtogni
parents: 20741
diff changeset
352 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
353 ((uint32_t *)avctx->extradata)[0] = 0;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
354 ((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
355 (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
356 } else {
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
357 /* has extra slice header (demux_rm or rm->avi streamcopy) */
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
358 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
359 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
360 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
361 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
362 avctx->sub_id= AV_RB32(avctx->extradata+4);
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
363
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
364 // 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
365 break;
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
366
4ca6b585aa58 simplify extradata handling and make passing extradata on the default.
reimar
parents: 18004
diff changeset
367 default:
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
368 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
369 break;
32105
c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).
reimar
parents: 31959
diff changeset
370 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
371 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
372 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
373 break;
7736
b81b0ab0aa40 put M4S2 & MP4S headers in avctx->extradata (in the unlikely case that they arent missing completly)
michael
parents: 7722
diff changeset
374 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
375
8264
1f3708389d0a 10l (broken ffmpeg12)
michael
parents: 8237
diff changeset
376 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
377 avctx->bits_per_coded_sample= sh->bih->biBitCount;
7126
d3fd5d568594 passing extra stuff from real stuff to lavc
michael
parents: 7051
diff changeset
378
33027
55de45e1d943 Do not use deprecated avcodec_thread_init, it is broken and does nothing currently.
reimar
parents: 33010
diff changeset
379 avctx->thread_count = lavc_param_threads;
33028
038ff73f9894 Enable both frame and slice threading.
reimar
parents: 33027
diff changeset
380 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
381 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
382 // 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
383 set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT);
a6be6a134ac0 Fix XVMC decoding (avcodec_open would fail if thread_count is set)
reimar
parents: 33032
diff changeset
384
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
385 /* open it */
33933
a5f1aaf21790 Replace several deprecated functions.
reimar
parents: 33871
diff changeset
386 if (avcodec_open2(avctx, lavc_codec, NULL) < 0) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
387 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec);
21498
f2c58d4fb683 Fix memleak if vd_ffmpeg init fails
reimar
parents: 21457
diff changeset
388 uninit(sh);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
389 return 0;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
390 }
28766
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
391 // 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
392 // 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
393 set_format_params(avctx, avctx->pix_fmt);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
394 mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: libavcodec init OK!\n");
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
395 return 1; //mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
396 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
397
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
398 // uninit driver
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
399 static void uninit(sh_video_t *sh){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
400 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
401 AVCodecContext *avctx = ctx->avctx;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
402
33260
e180057420a5 Fix segfault with -lavdopts vstats and some codecs.
iive
parents: 33255
diff changeset
403 if(lavc_param_vstats && avctx->coded_frame){
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
404 int i;
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
405 for(i=1; i<32; i++){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
406 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "QP: %d, count: %d\n", i, ctx->qp_stat[i]);
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
407 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
408 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_ArithmeticMeanOfQP,
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
409 ctx->qp_sum / avctx->coded_frame->coded_picture_number,
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
410 1.0/(ctx->inv_qp_sum / avctx->coded_frame->coded_picture_number)
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
411 );
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
412 }
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
413
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
414 if (avctx) {
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
415 if (avctx->codec && avcodec_close(avctx) < 0)
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
416 mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec);
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
417
22092
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
418 av_freep(&avctx->extradata);
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
419 av_freep(&avctx->palctrl);
acac2d8bc25f Cosmetics
reimar
parents: 22091
diff changeset
420 av_freep(&avctx->slice_offset);
22091
035fd43fe5f1 Avoid crash in uninit if codec not found
reimar
parents: 22076
diff changeset
421 }
5939
65ee86f5a45f avid mjpeg support (external huffman table)
alex
parents: 5875
diff changeset
422
14431
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
423 av_freep(&avctx);
0c10f923746e change malloc and free to av_ variants where needed.
reimar
parents: 14169
diff changeset
424 av_freep(&ctx->pic);
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 32507
diff changeset
425 free(ctx);
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
426 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
427
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
428 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
429 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
430 int y, int type, int height){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
431 sh_video_t *sh = s->opaque;
29059
48ba0e64e754 Use MP_MAX_PLANES as size of arrays passed to mpcodecs_draw_slice.
reimar
parents: 28956
diff changeset
432 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
433 int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]};
24142
931b5401fa01 Fix some unused variable warnings.
diego
parents: 23381
diff changeset
434 #if 0
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
435 int start=0, i;
10449
498568fe7fd8 width -> frame / field type
michael
parents: 10436
diff changeset
436 int width= s->width;
13489
912c906db2ed compensate for width/height being picture width/height instead of bitstream width/height
michael
parents: 13473
diff changeset
437 int skip_stride= ((width<<lavc_param_lowres)+15)>>4;
9400
e572a8df7e88 10l to kabi (compile fix, uint8->uint8_t)
arpi
parents: 8885
diff changeset
438 uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride];
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
439 int threshold= s->coded_frame->age;
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
440 if(s->pict_type!=B_TYPE){
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
441 for(i=0; i*16<width+16; i++){
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
442 if(i*16>=width || skip[i]>=threshold){
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
443 if(start==i) start++;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
444 else{
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
445 uint8_t *src2[3]= {src[0] + start*16,
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
446 src[1] + start*8,
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
447 src[2] + start*8};
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
448 //printf("%2d-%2d x %d\n", start, i, y);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
449 mpcodecs_draw_slice (sh, src2, stride, (i-start)*16, height, start*16, y);
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
450 start= i+1;
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
451 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
452 }
6740
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
453 }
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
454 }else
913736867009 10l y422p -> y420p
michael
parents: 6739
diff changeset
455 #endif
30588
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
456 if (height < 0)
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
457 {
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
458 int i;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
459 height = -height;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
460 y -= height;
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
461 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
462 {
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
463 strides[i] = -strides[i];
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
464 source[i] -= strides[i];
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
465 }
4cc35c457d9e Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at
reimar
parents: 30555
diff changeset
466 }
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
467 if (y < sh->disp_h) {
31270
5f777257f6af Minor code simplification.
reimar
parents: 30588
diff changeset
468 height = FFMIN(height, sh->disp_h-y);
5f777257f6af Minor code simplification.
reimar
parents: 30588
diff changeset
469 mpcodecs_draw_slice (sh, source, strides, sh->disp_w, height, 0, y);
15683
978f2346dc43 correcting the previous draw_slice fix
henry
parents: 15678
diff changeset
470 }
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
471 }
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
472
10436
f9e4db4e4759 new ff_draw_horiz_band()
michael
parents: 10423
diff changeset
473
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
474 static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
475 vd_ffmpeg_ctx *ctx = sh->context;
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
476 AVCodecContext *avctx = ctx->avctx;
11194
c9a3a1e70263 sample_aspect_ratio
michael
parents: 11064
diff changeset
477 float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
478 int width, height;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
479
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
480 width = avctx->width;
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
481 height = avctx->height;
15569
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
482
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
483 // HACK!
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
484 // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
485 // use dimensions from BIH to avoid black borders at the right and bottom.
dff7e79b194f quicktime fix update
henry
parents: 15567
diff changeset
486 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
487 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
488 height = sh->bih->biHeight>>lavc_param_lowres;
15567
c8ef0513f470 prefer width&height from bitmapinfoheader for h263 streams
henry
parents: 15064
diff changeset
489 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
490
11414
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
491 // it is possible another vo buffers to be used after vo config()
8770be0a5bb5 aspect change does not flush buffers
iive
parents: 11372
diff changeset
492 // lavc reset its buffers on width/heigh change but not on aspect change!!!
22277
de3ca43ae51e reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
nicodvb
parents: 22222
diff changeset
493 if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) ||
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
494 width != sh->disp_w ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
495 height != sh->disp_h ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
496 pix_fmt != ctx->pix_fmt ||
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
497 !ctx->vo_initialized)
5280
ea8f3e8f39c1 added aspect ratio support and local ctx
alex
parents: 5219
diff changeset
498 {
32603
02830ab7afb7 Reset ctx->vo_initialized to 0 on a resolution change.
reimar
parents: 32592
diff changeset
499 ctx->vo_initialized = 0;
28766
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
500 // this is a special-case HACK for MPEG-1/2 VDPAU that uses neither get_format nor
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
501 // sets the value correctly in avcodec_open.
4725b3ebdba3 Add another hack to work-around the currently completely inconsistent way in
reimar
parents: 28732
diff changeset
502 set_format_params(avctx, avctx->pix_fmt);
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
503 mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
32439
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
504
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
505 // Do not overwrite s->aspect on the first call, so that a container
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
506 // aspect if available is preferred.
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
507 // But set it even if the sample aspect did not change, since a
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
508 // resolution change can cause an aspect change even if the
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
509 // _sample_ aspect is unchanged.
2f1ccd169a7f Improve vd_ffmpeg aspect handling to respect container aspect if possible
reimar
parents: 32378
diff changeset
510 if (sh->aspect == 0 || ctx->last_sample_aspect_ratio.den)
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
511 sh->aspect = aspect;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
512 ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
513 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
514 sh->disp_h = height;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
515 ctx->pix_fmt = pix_fmt;
28527
90da3cbfbdd9 Use fmt-conversion.h in vd_ffmpeg.c
reimar
parents: 28525
diff changeset
516 ctx->best_csp = pixfmt2imgfmt(pix_fmt);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
517 if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp))
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
518 return -1;
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
519 ctx->vo_initialized = 1;
5592
b545d56314d2 yuy2 support, fixed bug of dropping frame after config_vo calls
arpi
parents: 5517
diff changeset
520 }
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
521 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
522 }
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
523
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
524 static int get_buffer(AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
525 sh_video_t *sh = avctx->opaque;
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
526 vd_ffmpeg_ctx *ctx = sh->context;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
527 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
528 int flags= MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
529 int type= MP_IMGTYPE_IPB;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
530 int width= avctx->width;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
531 int height= avctx->height;
33200
17ed3a57c83c Allow DR to work with reget_buffer when no buffer_hints are set.
reimar
parents: 33199
diff changeset
532 // special case to handle reget_buffer without buffer hints
17ed3a57c83c Allow DR to work with reget_buffer when no buffer_hints are set.
reimar
parents: 33199
diff changeset
533 if (pic->opaque && pic->data[0] && !pic->buffer_hints)
17ed3a57c83c Allow DR to work with reget_buffer when no buffer_hints are set.
reimar
parents: 33199
diff changeset
534 return 0;
29879
5dbbcdb2fb47 Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents: 29842
diff changeset
535 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
536 //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count);
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
537
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
538 if (pic->buffer_hints) {
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
539 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints);
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
540 type = MP_IMGTYPE_TEMP;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
541 if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
542 flags |= MP_IMGFLAG_READABLE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
543 if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
544 type = MP_IMGTYPE_STATIC;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
545 flags |= MP_IMGFLAG_PRESERVE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
546 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
547 if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
548 type = MP_IMGTYPE_STATIC;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
549 flags |= MP_IMGFLAG_PRESERVE;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
550 }
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
551 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
552 MP_IMGFLAG_DRAW_CALLBACK:0;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
553 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n");
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
554 } else {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
555 if(!pic->reference){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
556 ctx->b_count++;
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
557 flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
558 MP_IMGFLAG_DRAW_CALLBACK:0;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
559 }else{
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
560 ctx->ip_count++;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
561 flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
562 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0);
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
563 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
564 }
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
565
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
566 if(init_vo(sh, avctx->pix_fmt) < 0){
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
567 avctx->release_buffer= avcodec_default_release_buffer;
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
568 avctx->get_buffer= avcodec_default_get_buffer;
33199
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
569 avctx->reget_buffer= avcodec_default_reget_buffer;
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
570 if (pic->data[0])
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
571 release_buffer(avctx, pic);
9991
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
572 return avctx->get_buffer(avctx, pic);
8568ef7f6c2f segfault fix
michael
parents: 9982
diff changeset
573 }
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18917
diff changeset
574
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
575 if (IMGFMT_IS_HWACCEL(ctx->best_csp)) {
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
576 type = MP_IMGTYPE_NUMBERED | (0xffff << 16);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
577 } else
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
578 if (!pic->buffer_hints) {
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
579 if(ctx->b_count>1 || ctx->ip_count>2){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
580 mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure);
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
581
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
582 ctx->do_dr1=0; //FIXME
33869
9b59c0e0948c Fix neverending "DRI Failure" messages with frame multithreading.
reimar
parents: 33866
diff changeset
583 // For frame-multithreading these contexts aren't
9b59c0e0948c Fix neverending "DRI Failure" messages with frame multithreading.
reimar
parents: 33866
diff changeset
584 // the same and must both be updated.
9b59c0e0948c Fix neverending "DRI Failure" messages with frame multithreading.
reimar
parents: 33866
diff changeset
585 ctx->avctx->get_buffer=
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
586 avctx->get_buffer= avcodec_default_get_buffer;
33869
9b59c0e0948c Fix neverending "DRI Failure" messages with frame multithreading.
reimar
parents: 33866
diff changeset
587 ctx->avctx->reget_buffer=
33199
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
588 avctx->reget_buffer= avcodec_default_reget_buffer;
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
589 if (pic->data[0])
85d0e813370f Allow reget_buffer to somewhat work after DRI failure.
reimar
parents: 33197
diff changeset
590 release_buffer(avctx, pic);
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
591 return avctx->get_buffer(avctx, pic);
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
592 }
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
593
32613
e006d3eb4e60 Treat non-ref frames like B-frames even if has_b_frames is not set and
reimar
parents: 32603
diff changeset
594 if(avctx->has_b_frames || ctx->b_count){
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
595 type= MP_IMGTYPE_IPB;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
596 }else{
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
597 type= MP_IMGTYPE_IP;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
598 }
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
599 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
600 }
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
601
30074
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
602 if (ctx->best_csp == IMGFMT_RGB8 || ctx->best_csp == IMGFMT_BGR8)
5cb79ad246f2 Support mp_image with allocated palette.
reimar
parents: 29914
diff changeset
603 flags |= MP_IMGFLAG_RGB_PALETTE;
29879
5dbbcdb2fb47 Use avcodec_align_dimensions to appropriately align width and height in
reimar
parents: 29842
diff changeset
604 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
605 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
606
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10847
diff changeset
607 // ok, let's see what did we get:
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
608 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
609 !(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
610 // 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
611 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
612 } else
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
613 avctx->draw_horiz_band= NULL;
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
614 if(IMGFMT_IS_HWACCEL(mpi->imgfmt)) {
28582
4d64f83e2fac Add support for VDPAU video out, including hardware decoding.
reimar
parents: 28573
diff changeset
615 avctx->draw_horiz_band= draw_slice;
4d64f83e2fac Add support for VDPAU video out, including hardware decoding.
reimar
parents: 28573
diff changeset
616 }
28556
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
617 #if CONFIG_XVMC
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
618 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
619 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
620 if(!avctx->xvmc_acceleration) {
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
621 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
622 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
623 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
624 // 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
625 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
626 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
627 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
628 assert(0);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
629 exit(1);
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
630 // 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
631 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
632 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
633 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
634 assert(render != 0);
28573
67d2779b13ec The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
diego
parents: 28572
diff changeset
635 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
636 }
85d1ab476ad5 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
reimar
parents: 28555
diff changeset
637 #endif
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
638
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
639 pic->data[0]= mpi->planes[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
640 pic->data[1]= mpi->planes[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
641 pic->data[2]= mpi->planes[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
642 pic->data[3]= mpi->planes[3];
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
643
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
644 #if 0
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
645 assert(mpi->width >= ((width +align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
646 assert(mpi->height >= ((height+align)&(~align)));
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
647 assert(mpi->stride[0] >= mpi->width);
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
648 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
649 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
650 const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1);
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
651
7051
d03fad6123a3 asserts to check buffer size and non overlapingness
michael
parents: 7004
diff changeset
652 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
653 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
654 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
655 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
656 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
657 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
658 }
8595
64efd67fee9b i hate asserts
arpi
parents: 8586
diff changeset
659 #endif
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
660
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
661 /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
662 * lavc will check that and die with an error message, if its not true
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
663 */
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
664 pic->linesize[0]= mpi->stride[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
665 pic->linesize[1]= mpi->stride[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
666 pic->linesize[2]= mpi->stride[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
667 pic->linesize[3]= mpi->stride[3];
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
668
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
669 pic->opaque = mpi;
6742
93bce3460e2a fallback to slices, if dr1 fails (bug found by kabi)
michael
parents: 6740
diff changeset
670 //printf("%X\n", (int)mpi->planes[0]);
6869
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
671 #if 0
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
672 if(mpi->flags&MP_IMGFLAG_DIRECT)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
673 printf("D");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
674 else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
675 printf("S");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
676 else
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
677 printf(".");
591a6c942551 compatibility with _OLD_ lavc & uv_stride check
michael
parents: 6835
diff changeset
678 #endif
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
679 if(pic->reference){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
680 pic->age= ctx->ip_age[0];
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
681
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
682 ctx->ip_age[0]= ctx->ip_age[1]+1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
683 ctx->ip_age[1]= 1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
684 ctx->b_age++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
685 }else{
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
686 pic->age= ctx->b_age;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
687
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
688 ctx->ip_age[0]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
689 ctx->ip_age[1]++;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
690 ctx->b_age=1;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
691 }
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
692 pic->type= FF_BUFFER_TYPE_USER;
7928
5d1c1d73e8f3 handle direct rendering buffer allocation failure
michael
parents: 7898
diff changeset
693 return 0;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
694 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
695
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
696 static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
697 mp_image_t *mpi= pic->opaque;
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
698 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
699 vd_ffmpeg_ctx *ctx = sh->context;
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
700 int i;
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
701
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
702 //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
703
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
704 if(ctx->ip_count <= 2 && ctx->b_count<=1){
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
705 if(mpi->flags&MP_IMGFLAG_PRESERVE)
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
706 ctx->ip_count--;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
707 else
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
708 ctx->b_count--;
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
709 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
710
28554
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
711 if (mpi) {
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
712 // Palette support: free palette buffer allocated in get_buffer
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
713 if (mpi->bpp == 8)
36fbf025f4da Merge two checks for mpi != NULL
reimar
parents: 28553
diff changeset
714 av_freep(&mpi->planes[1]);
28555
71232187cac5 Unset MP_IMGFLAG_IN_USE in release_buffer.
reimar
parents: 28554
diff changeset
715 // 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
716 mpi->usage_count--;
28553
81931c7c0cf3 Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
reimar
parents: 28552
diff changeset
717 }
11420
b99147bd6cce Support for paletted codecs in ffmpeg
rtognimp
parents: 11414
diff changeset
718
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
719 if(pic->type!=FF_BUFFER_TYPE_USER){
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
720 avcodec_default_release_buffer(avctx, pic);
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
721 return;
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
722 }
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
723
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
724 for(i=0; i<4; i++){
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
725 pic->data[i]= NULL;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
726 }
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
727 //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
728 }
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
729
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
730 // copypaste from demux_real.c - it should match to get it working!
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
731 //FIXME put into some header
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
732 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
733 uint32_t chunks; // number of chunks
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
734 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
735 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
736 uint32_t chunktab; // offset to chunk offset array
7573
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
737 } dp_hdr_t;
30e1c1f77737 rv10 cleanup
michael
parents: 7564
diff changeset
738
31520
9f934200bf9e Replace HAVE_BIGENDIAN #ifdef around swap_palette() by av_unused attribute.
diego
parents: 31518
diff changeset
739 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
740 {
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
741 int i;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
742 uint32_t *p = pal;
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
743 for (i = 0; i < AVPALETTE_COUNT; i++)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
744 p[i] = le2me_32(p[i]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
745 }
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
746
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
747 // decode a frame
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
748 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
749 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
750 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
751 vd_ffmpeg_ctx *ctx = sh->context;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
752 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
753 AVCodecContext *avctx = ctx->avctx;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
754 mp_image_t *mpi=NULL;
6737
39619804c8b6 imgtype IP support
michael
parents: 6736
diff changeset
755 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
756 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
757
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
758 if(len<=0) return NULL; // skipped frame
6734
e614de962b6e fixing fixmes
michael
parents: 6733
diff changeset
759
12033
3dd75c52bf38 use flag for XvMC codec recognition and enable dr1 for fixed version of lavc
iive
parents: 12006
diff changeset
760 //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
761 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
762 avctx->draw_horiz_band=NULL;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25241
diff changeset
763 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
764 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
765 (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
766 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
767 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
768 // 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
769 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
770 }
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
771 }
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
772
33235
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
773 avctx->skip_idct = skip_idct;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
774 avctx->skip_frame = skip_frame;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
775
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
776 if (flags&3) {
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
777 avctx->skip_frame = AVDISCARD_NONREF;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
778 if (flags&2)
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
779 avctx->skip_idct = AVDISCARD_ALL;
6e6eac0ea1b4 Replace usage of AVCodecContext member hurry_up by skip_idct and skip_frame.
ib
parents: 33200
diff changeset
780 }
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
781
16497
182794778785 print the first 16 bytes of frame data with -v -v, helps detect when
reimar
parents: 15986
diff changeset
782 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
783 ((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
784 av_init_packet(&pkt);
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
785 pkt.data = data;
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
786 pkt.size = len;
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
787 // HACK: make PNGs decode normally instead of as CorePNG delta frames
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32686
diff changeset
788 pkt.flags = AV_PKT_FLAG_KEY;
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
789 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
790 /* Pass palette to codec */
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
791 uint8_t *pal = av_packet_new_side_data(&pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
792 unsigned palsize = sh->bih->biSize - sizeof(*sh->bih);
34022
fab5ae1132e7 Fix broken indentation due to a tab that slipped in.
reimar
parents: 34021
diff changeset
793 if (palsize == 0) {
34021
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
794 /* Palette size in biClrUsed */
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
795 palsize = sh->bih->biClrUsed * 4;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
796 }
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
797 memcpy(pal, sh->bih+1, FFMIN(palsize, AVPALETTE_SIZE));
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
798 ctx->palette_sent = 1;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
799 }
29298
fb99e3db8f8b Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly
reimar
parents: 29059
diff changeset
800 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
801 pkt.data = NULL;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
802 pkt.size = 0;
fbb87f092560 Get rid of usage of deprecated palctrl which no longer works anyway.
reimar
parents: 33933
diff changeset
803 av_destruct_packet(&pkt);
13190
8be7dbcea0be AVC (fourcc avc1) in mp4 support
rtognimp
parents: 13075
diff changeset
804
9982
cd76f332bdee fallback to non-dr1 if the codec wants more than 1+2 buffers
michael
parents: 9931
diff changeset
805 dr1= ctx->do_dr1;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
806 if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");
9547
3b3b7b6fdb22 merging fourcc with codec_tag
michael
parents: 9400
diff changeset
807 //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
808 //-- vstats generation
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
809 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
810 static FILE *fvstats=NULL;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
811 char filename[20];
6834
2d7dfcc79651 Fix overall frametime overflow, hopefully long long int is portable. (untested, will test tomorrow)
atmos4
parents: 6833
diff changeset
812 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
813 static int frame_number=0;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
814 static double all_frametime=0.0;
8413
2670aec42989 AVVideoFrame -> AVFrame
michael
parents: 8411
diff changeset
815 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
816 double quality=0.0;
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
817
33260
e180057420a5 Fix segfault with -lavdopts vstats and some codecs.
iive
parents: 33255
diff changeset
818 if(!pic) break;
e180057420a5 Fix segfault with -lavdopts vstats and some codecs.
iive
parents: 33255
diff changeset
819
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
820 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
821 time_t today2;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
822 struct tm *today;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
823 today2 = time(NULL);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
824 today = localtime(&today2);
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
825 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
826 today->tm_min, today->tm_sec);
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
827 fvstats = fopen(filename, "w");
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
828 if(!fvstats) {
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
829 perror("fopen");
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
830 lavc_param_vstats=0; // disable block
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
831 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
832 /*exit(1);*/
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
833 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
834 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
835
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
836 // average MB quantizer
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
837 {
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
838 int x, y;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
839 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
840 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
841 int8_t *q = pic->qscale_table;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
842 for(y = 0; y < h; y++) {
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
843 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
844 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
845 q += pic->qstride;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
846 }
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
847 quality /= w * h;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
848 }
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
849
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
850 all_len+=len;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
851 all_frametime+=sh->frametime;
8411
5630321c8026 ffmpeg cleanup/messup support
michael
parents: 8347
diff changeset
852 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
853 ++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
854 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
855 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
856 (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
857 switch(pic->pict_type){
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
858 case FF_I_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
859 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
860 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
861 case FF_P_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
862 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
863 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
864 case FF_S_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
865 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
866 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
867 case FF_B_TYPE:
8065
a3e7c0e16d5b fixing vstats so B frames are shown as B and not P
michael
parents: 7984
diff changeset
868 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
869 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
870 default:
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
871 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
872 break;
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
873 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
874
9865
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
875 ctx->qp_stat[(int)(quality+0.5)]++;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
876 ctx->qp_sum += quality;
30893b593947 Adaptive quantization support for "-lavcopts psnr" and "-lavdopts vstats".
rguyom
parents: 9547
diff changeset
877 ctx->inv_qp_sum += 1.0/(double)quality;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
878
6828
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
879 break;
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
880 }
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
881 //--
010be15e48ad Generate ffmpeg compatible vstats_<time>.log, when -lavdopts vstats is specified.
atmos4
parents: 6771
diff changeset
882
31953
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
883 if(!got_picture) {
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
884 if (avctx->codec->id == CODEC_ID_H264)
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
885 return &mpi_no_picture; // H.264 first field only
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
886 else
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
887 return NULL; // skipped image
2b390c08ed07 Improve correct-pts with PAFF streams.
cehoyos
parents: 31926
diff changeset
888 }
6738
77f2713ae7fd svq1 direct rendering
michael
parents: 6737
diff changeset
889
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
890 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
891
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
892 if(dr1 && pic->opaque){
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
893 mpi= (mp_image_t *)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
894 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
895
5482
cd97c8313300 libavcodec slices support
arpi
parents: 5457
diff changeset
896 if(!mpi)
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
897 mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
28508
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
898 avctx->width, avctx->height);
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
899 if(!mpi){ // temporary!
c475b032694f Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
reimar
parents: 28507
diff changeset
900 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
901 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
902 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
903
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
904 if(!dr1){
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
905 mpi->planes[0]=pic->data[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
906 mpi->planes[1]=pic->data[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
907 mpi->planes[2]=pic->data[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
908 mpi->planes[3]=pic->data[3];
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
909 mpi->stride[0]=pic->linesize[0];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
910 mpi->stride[1]=pic->linesize[1];
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
911 mpi->stride[2]=pic->linesize[2];
30114
7470ba76f228 Also pass the 4th plane for planar formats on to libavcodec.
reimar
parents: 30074
diff changeset
912 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
913 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
914
11372
3761aff4722e If alex is too lazy to apply a patch, then i'll do it :)
attila
parents: 11194
diff changeset
915 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
916 return NULL;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
917
32507
97738e6f82dc Use IMGFMT to compare instead of PIX_FMT to avoid issues
reimar
parents: 32488
diff changeset
918 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
919 // 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
920 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
921 mpi->stride[2]*=2;
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
922 }
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
923
29401
f01023c524c3 Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents: 29298
diff changeset
924 #if HAVE_BIGENDIAN
22076
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
925 // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
926 if (mpi->bpp == 8)
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
927 swap_palette(mpi->planes[1]);
e81065a87c2d Swap palette on bigendian.
reimar
parents: 21946
diff changeset
928 #endif
6665
3284abe2d73f support avcontext based quant_store export
alex
parents: 6355
diff changeset
929 /* to comfirm with newer lavc style */
8339
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
930 mpi->qscale =pic->qscale_table;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
931 mpi->qstride=pic->qstride;
ff0bddb59e81 support for lavc build 4641
michael
parents: 8264
diff changeset
932 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
933 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
934 mpi->fields = MP_IMGFIELD_ORDERED;
bcf9862f61b2 set top_field first for lavc decoding and add MP_IMGFIELD_INTERLACED
michael
parents: 11541
diff changeset
935 if(pic->interlaced_frame) mpi->fields |= MP_IMGFIELD_INTERLACED;
28509
905a8897c910 Remove trailing whitespace from vd_ffmpeg.
reimar
parents: 28508
diff changeset
936 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
937 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
938
4952
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
939 return mpi;
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
940 }
ffeba1050226 vd_ffmpeg added
arpi
parents:
diff changeset
941
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
942 static enum PixelFormat get_format(struct AVCodecContext *avctx,
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
943 const enum PixelFormat *fmt){
28627
c327b2e9b259 Return PIX_FMT_NONE if the video system refuses all other formats.
iive
parents: 28608
diff changeset
944 enum PixelFormat selected_format;
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
945 int imgfmt;
28525
1e671b7bf2e0 Consistently place whitespace around * ( ) and ,
reimar
parents: 28524
diff changeset
946 sh_video_t *sh = avctx->opaque;
28523
3fb5a5946415 Indentation and other whitespace fixes
reimar
parents: 28522
diff changeset
947 int i;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
948
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
949 for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
950 imgfmt = pixfmt2imgfmt(fmt[i]);
32488
49722126eba9 Add and use a IMGFMT_IS_HWACCEL define.
reimar
parents: 32439
diff changeset
951 if(!IMGFMT_IS_HWACCEL(imgfmt)) continue;
28564
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
952 mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i);
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
953 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
954 break;
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
955 }
f2f0357b2c30 Restructure get_format so it can easily be extended to handle VDPAU
reimar
parents: 28563
diff changeset
956 }
28627
c327b2e9b259 Return PIX_FMT_NONE if the video system refuses all other formats.
iive
parents: 28608
diff changeset
957 selected_format = fmt[i];
33043
04203ae3000c Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents: 33042
diff changeset
958 if (selected_format == PIX_FMT_NONE)
04203ae3000c Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions.
reimar
parents: 33042
diff changeset
959 selected_format = avcodec_default_get_format(avctx, fmt);
28731
244353700b38 Create a set_format_params function that sets all the special options needed
reimar
parents: 28627
diff changeset
960 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
961 return selected_format;
12006
f4537eee7c33 xvmc use get_format for IDCT/MC recognition
iive
parents: 11992
diff changeset
962 }