annotate libmpcodecs/vd_ffmpeg.c @ 33043:04203ae3000c

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