Mercurial > mplayer.hg
annotate libmpdemux/video.c @ 18410:f07c9898029f
typo/wording fixes
author | diego |
---|---|
date | Tue, 09 May 2006 14:07:26 +0000 |
parents | a1375e440e92 |
children | 22805699b7b1 |
rev | line source |
---|---|
2567 | 1 // read video frame |
2 | |
2775 | 3 #include "config.h" |
4 | |
2567 | 5 #include <stdio.h> |
2775 | 6 #ifdef HAVE_MALLOC_H |
7 #include <malloc.h> | |
8 #endif | |
2567 | 9 #include <stdlib.h> |
3726 | 10 #include <string.h> |
2567 | 11 #include <unistd.h> |
12 | |
13 #include "mp_msg.h" | |
14 #include "help_mp.h" | |
15 | |
16 #include "stream.h" | |
17 #include "demuxer.h" | |
18 #include "stheader.h" | |
19 #include "parse_es.h" | |
20 #include "mpeg_hdr.h" | |
21 | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
22 /* sub_cc (closed captions)*/ |
17012 | 23 #include "sub_cc.h" |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
24 |
17343
b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
nicodvb
parents:
17339
diff
changeset
|
25 #ifdef USE_LIBAVCODEC_SO |
b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
nicodvb
parents:
17339
diff
changeset
|
26 #include <ffmpeg/avcodec.h> |
b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
nicodvb
parents:
17339
diff
changeset
|
27 #elif defined(USE_LIBAVCODEC) |
b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
nicodvb
parents:
17339
diff
changeset
|
28 #include "libavcodec/avcodec.h" |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
29 #else |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
30 #define FF_INPUT_BUFFER_PADDING_SIZE 8 |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
31 #endif |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
32 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
33 /* biCompression constant */ |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
34 #define BI_RGB 0L |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
35 |
18219
2ea5d88eacd4
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
diego
parents:
17960
diff
changeset
|
36 #ifdef STREAMING_LIVE555 |
9457
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
37 #include "demux_rtp.h" |
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
38 #endif |
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
39 |
2567 | 40 static mp_mpeg_header_t picture; |
41 | |
8967 | 42 static int telecine=0; |
43 static float telecine_cnt=-2.5; | |
44 | |
2567 | 45 int video_read_properties(sh_video_t *sh_video){ |
46 demux_stream_t *d_video=sh_video->ds; | |
47 | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
48 enum { |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
49 VIDEO_MPEG12, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
50 VIDEO_MPEG4, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
51 VIDEO_H264, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
52 VIDEO_OTHER |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
53 } video_codec; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
54 |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
55 if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
56 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) || |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16184
diff
changeset
|
57 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_GXF) || |
16314 | 58 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PES) || |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
59 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
60 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
61 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
18219
2ea5d88eacd4
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
diego
parents:
17960
diff
changeset
|
62 #ifdef STREAMING_LIVE555 |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
63 || ((d_video->demuxer->file_format == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
64 #endif |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
65 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
66 video_codec = VIDEO_MPEG12; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
67 else if((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG4_ES) || |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
68 ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000004)) || |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
69 ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000004)) |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
70 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
71 video_codec = VIDEO_MPEG4; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
72 else if((d_video->demuxer->file_format == DEMUXER_TYPE_H264_ES) || |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
73 ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000005)) || |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
74 ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000005)) |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
75 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
76 video_codec = VIDEO_H264; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
77 else |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
78 video_codec = VIDEO_OTHER; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
79 |
2567 | 80 // Determine image properties: |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
81 switch(video_codec){ |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
82 case VIDEO_OTHER: { |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
83 if((d_video->demuxer->file_format == DEMUXER_TYPE_ASF) || (d_video->demuxer->file_format == DEMUXER_TYPE_AVI)) { |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
84 // display info: |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
85 |
5898 | 86 #if 0 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
87 if(sh_video->bih->biCompression == BI_RGB && |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
88 (sh_video->video.fccHandler == mmioFOURCC('D', 'I', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
89 sh_video->video.fccHandler == mmioFOURCC('R', 'G', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
90 sh_video->video.fccHandler == mmioFOURCC('R', 'A', 'W', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
91 sh_video->video.fccHandler == 0)) { |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
92 sh_video->format = mmioFOURCC(0, 'R', 'G', 'B') | sh_video->bih->biBitCount; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
93 } |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
94 else |
5898 | 95 #endif |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
96 sh_video->format=sh_video->bih->biCompression; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
97 |
2567 | 98 sh_video->disp_w=sh_video->bih->biWidth; |
99 sh_video->disp_h=abs(sh_video->bih->biHeight); | |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
100 |
17339
ba7af0bb3e96
disabled hack to read the properties of mpeg1/2 video in avi and asf: it's totally useless and leads mplayer to crash
nicodvb
parents:
17277
diff
changeset
|
101 #if 0 |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
102 /* hack to support decoding of mpeg1 chunks in AVI's with libmpeg2 -- 2002 alex */ |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
103 if ((sh_video->format == 0x10000001) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
104 (sh_video->format == 0x10000002) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
105 (sh_video->format == mmioFOURCC('m','p','g','1')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
106 (sh_video->format == mmioFOURCC('M','P','G','1')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
107 (sh_video->format == mmioFOURCC('m','p','g','2')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
108 (sh_video->format == mmioFOURCC('M','P','G','2')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
109 (sh_video->format == mmioFOURCC('m','p','e','g')) || |
7302
7d32189dbae4
typo (checking for mpeg twice, instead of mpeg & MPEG)
michael
parents:
7208
diff
changeset
|
110 (sh_video->format == mmioFOURCC('M','P','E','G'))) |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
111 { |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
112 int saved_pos, saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
113 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
114 /* demuxer pos saving is required for libavcodec mpeg decoder as it's |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
115 reading the mpeg header self! */ |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
116 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
117 saved_pos = d_video->buffer_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
118 saved_type = d_video->demuxer->file_format; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
119 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
120 d_video->demuxer->file_format = DEMUXER_TYPE_MPEG_ES; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
121 video_read_properties(sh_video); |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
122 d_video->demuxer->file_format = saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
123 d_video->buffer_pos = saved_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
124 // goto mpeg_header_parser; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
125 } |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
126 #endif |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
127 } |
2567 | 128 break; |
129 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
130 case VIDEO_MPEG4: { |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
131 int pos = 0, vop_cnt=0, units[3]; |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
132 videobuf_len=0; videobuf_code_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
133 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");fflush(stdout); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
134 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
135 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
136 if(i<=0x11F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
137 if(!i || !skip_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
138 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
139 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
140 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
141 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
142 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
143 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
144 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
145 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
146 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
147 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
148 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
149 } |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
150 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
151 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Layer Start code... ");fflush(stdout); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
152 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
153 int i=sync_video_packet(d_video); |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
154 mp_msg(MSGT_DECVIDEO,MSGL_V,"M4V: 0x%X\n",i); |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
155 if(i>=0x120 && i<=0x12F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
156 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
157 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
158 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
159 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
160 } |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
161 pos = videobuf_len+4; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
162 if(!read_video_packet(d_video)){ |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
163 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read Video Object Layer Header\n"); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
164 return 0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
165 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
166 mp4_header_process_vol(&picture, &(videobuffer[pos])); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
167 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK! FPS SEEMS TO BE %.3f\nSearching for Video Object Plane Start code... ", sh_video->fps);fflush(stdout); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
168 mp4_init: |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
169 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
170 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
171 if(i==0x1B6) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
172 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
173 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
174 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
175 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
176 } |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
177 pos = videobuf_len+4; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
178 if(!read_video_packet(d_video)){ |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
179 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read Video Object Plane Header\n"); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
180 return 0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
181 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
182 mp4_header_process_vop(&picture, &(videobuffer[pos])); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
183 units[vop_cnt] = picture.timeinc_unit; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
184 vop_cnt++; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
185 //mp_msg(MSGT_DECVIDEO,MSGL_V, "TYPE: %d, unit: %d\n", picture.picture_type, picture.timeinc_unit); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
186 if(!picture.fps) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
187 int i, mn, md, mx, diff; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
188 if(vop_cnt < 3) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
189 goto mp4_init; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
190 |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
191 i=0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
192 mn = mx = units[0]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
193 for(i=0; i<3; i++) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
194 if(units[i] < mn) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
195 mn = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
196 if(units[i] > mx) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
197 mx = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
198 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
199 md = mn; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
200 for(i=0; i<3; i++) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
201 if((units[i] > mn) && (units[i] < mx)) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
202 md = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
203 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
204 mp_msg(MSGT_DECVIDEO,MSGL_V, "MIN: %d, mid: %d, max: %d\n", mn, md, mx); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
205 if(mx - md > md - mn) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
206 diff = md - mn; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
207 else |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
208 diff = mx - md; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
209 if(diff > 0){ |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
210 picture.fps = ((float)picture.timeinc_resolution) / diff; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
211 mp_msg(MSGT_DECVIDEO,MSGL_V, "FPS seems to be: %f, resolution: %d, delta_units: %d\n", picture.fps, picture.timeinc_resolution, diff); |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
212 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
213 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
214 if(picture.fps) { |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
215 sh_video->fps=picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
216 sh_video->frametime=1.0/picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
217 mp_msg(MSGT_DECVIDEO,MSGL_INFO, "FPS seems to be: %f\n", picture.fps); |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
218 } |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
219 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
220 sh_video->format=0x10000004; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
221 break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
222 } |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
223 case VIDEO_H264: { |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
224 int pos = 0; |
9824 | 225 videobuf_len=0; videobuf_code_len=0; |
226 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence parameter set... ");fflush(stdout); | |
227 while(1){ | |
228 int i=sync_video_packet(d_video); | |
229 if((i&~0x60) == 0x107 && i != 0x107) break; // found it! | |
230 if(!i || !skip_video_packet(d_video)){ | |
231 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
232 return 0; | |
233 } | |
234 } | |
235 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
236 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
237 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
238 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
239 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
240 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
241 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
242 } |
9824 | 243 } |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
244 pos = videobuf_len+4; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
245 if(!read_video_packet(d_video)){ |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
246 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read sequence parameter set\n"); |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
247 return 0; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
248 } |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
249 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos); |
9824 | 250 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for picture parameter set... ");fflush(stdout); |
251 while(1){ | |
252 int i=sync_video_packet(d_video); | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
253 mp_msg(MSGT_DECVIDEO,MSGL_V,"H264: 0x%X\n",i); |
9824 | 254 if((i&~0x60) == 0x108 && i != 0x108) break; // found it! |
255 if(!i || !read_video_packet(d_video)){ | |
256 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
257 return 0; | |
258 } | |
259 } | |
260 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Slice... ");fflush(stdout); | |
261 while(1){ | |
262 int i=sync_video_packet(d_video); | |
263 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; // found it! | |
264 if(!i || !read_video_packet(d_video)){ | |
265 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
266 return 0; | |
267 } | |
268 } | |
269 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
270 sh_video->format=0x10000005; | |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
271 if(picture.fps) { |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
272 sh_video->fps=picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
273 sh_video->frametime=1.0/picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
274 mp_msg(MSGT_DECVIDEO,MSGL_INFO, "FPS seems to be: %f\n", picture.fps); |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
275 } |
9824 | 276 break; |
277 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
278 case VIDEO_MPEG12: { |
17277
c568f01ef9f9
search next sequence_header untile a valid one is found
nicodvb
parents:
17226
diff
changeset
|
279 mpeg_header_parser: |
2567 | 280 // Find sequence_header first: |
281 videobuf_len=0; videobuf_code_len=0; | |
8967 | 282 telecine=0; telecine_cnt=-2.5; |
2567 | 283 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout); |
284 while(1){ | |
285 int i=sync_video_packet(d_video); | |
286 if(i==0x1B3) break; // found it! | |
287 if(!i || !skip_video_packet(d_video)){ | |
17932 | 288 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
2567 | 289 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); |
290 return 0; | |
291 } | |
292 } | |
293 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
294 // sh_video=d_video->sh;sh_video->ds=d_video; | |
295 // mpeg2_init(); | |
296 // ========= Read & process sequence header & extension ============ | |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
297 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
298 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
299 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
300 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
301 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
302 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
303 } |
2567 | 304 } |
305 | |
306 if(!read_video_packet(d_video)){ | |
307 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); | |
308 return 0; | |
309 } | |
310 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { | |
311 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); | |
17277
c568f01ef9f9
search next sequence_header untile a valid one is found
nicodvb
parents:
17226
diff
changeset
|
312 goto mpeg_header_parser; |
c568f01ef9f9
search next sequence_header untile a valid one is found
nicodvb
parents:
17226
diff
changeset
|
313 //return 0; |
2567 | 314 } |
315 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. | |
316 // videobuf_len=0; | |
317 int pos=videobuf_len; | |
318 if(!read_video_packet(d_video)){ | |
319 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); | |
320 return 0; | |
321 } | |
322 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { | |
323 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); | |
324 return 0; | |
325 } | |
326 } | |
327 | |
328 // printf("picture.fps=%d\n",picture.fps); | |
18398
a1375e440e92
COSMETICS: moved code to parse mpeg1/2 A/R to mpeg_hdr.c
nicodvb
parents:
18394
diff
changeset
|
329 sh_video->aspect = mpeg12_aspect_info(&picture); |
2567 | 330 // display info: |
331 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video | |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
332 sh_video->fps=picture.fps; |
2567 | 333 if(!sh_video->fps){ |
334 // if(!force_fps){ | |
335 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n"); | |
336 // return 0; | |
337 // } | |
338 sh_video->frametime=0; | |
339 } else { | |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
340 sh_video->frametime=1.0/picture.fps; |
2567 | 341 } |
342 sh_video->disp_w=picture.display_picture_width; | |
343 sh_video->disp_h=picture.display_picture_height; | |
344 // bitrate: | |
345 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ? | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
346 sh_video->i_bps=picture.bitrate * 400 / 8; |
2567 | 347 // info: |
348 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate); | |
10709 | 349 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
2567 | 350 picture.mpeg1?"MPEG1":"MPEG2", |
351 sh_video->disp_w,sh_video->disp_h, | |
352 picture.aspect_ratio_information, | |
353 sh_video->fps, | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
354 sh_video->i_bps * 8 / 1000.0, |
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
355 sh_video->i_bps / 1000.0 ); |
2567 | 356 break; |
357 } | |
358 } // switch(file_format) | |
359 | |
360 return 1; | |
361 } | |
362 | |
10263 | 363 void ty_processuserdata( unsigned char* buf, int len ); |
364 | |
4074 | 365 static void process_userdata(unsigned char* buf,int len){ |
366 int i; | |
6791 | 367 /* if the user data starts with "CC", assume it is a CC info packet */ |
368 if(len>2 && buf[0]=='C' && buf[1]=='C'){ | |
369 // mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n"); | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
370 if(subcc_enabled) subcc_process_data(buf+2,len-2); |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
371 } |
10263 | 372 if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' ) |
373 { | |
374 ty_processuserdata( buf + 2, len - 2 ); | |
375 return; | |
376 } | |
7208 | 377 if(verbose<2) return; |
4074 | 378 printf( "user_data: len=%3d %02X %02X %02X %02X '", |
379 len, buf[0], buf[1], buf[2], buf[3]); | |
380 for(i=0;i<len;i++) | |
6791 | 381 // if(buf[i]>=32 && buf[i]<127) putchar(buf[i]); |
382 if(buf[i]&0x60) putchar(buf[i]&0x7F); | |
4074 | 383 printf("'\n"); |
384 } | |
385 | |
2567 | 386 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){ |
387 demux_stream_t *d_video=sh_video->ds; | |
388 demuxer_t *demuxer=d_video->demuxer; | |
389 float frame_time=1; | |
390 float pts1=d_video->pts; | |
8965 | 391 float pts=0; |
392 int picture_coding_type=0; | |
2567 | 393 // unsigned char* start=NULL; |
394 int in_size=0; | |
395 | |
396 *start=NULL; | |
397 | |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
398 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16184
diff
changeset
|
399 demuxer->file_format==DEMUXER_TYPE_MPEG_GXF || |
16314 | 400 demuxer->file_format==DEMUXER_TYPE_MPEG_PES || |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
401 (demuxer->file_format==DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
402 || demuxer->file_format==DEMUXER_TYPE_PVA || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
403 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
10263 | 404 || demuxer->file_format==DEMUXER_TYPE_MPEG_TY |
18219
2ea5d88eacd4
Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
diego
parents:
17960
diff
changeset
|
405 #ifdef STREAMING_LIVE555 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
406 || (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer)) |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
407 #endif |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
408 ){ |
2567 | 409 int in_frame=0; |
410 //float newfps; | |
411 //videobuf_len=0; | |
412 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
413 int i=sync_video_packet(d_video); | |
4074 | 414 //void* buffer=&videobuffer[videobuf_len+4]; |
415 int start=videobuf_len+4; | |
2567 | 416 if(in_frame){ |
417 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
7465 | 418 #if 0 |
2567 | 419 // send END OF FRAME code: |
420 videobuffer[videobuf_len+0]=0; | |
421 videobuffer[videobuf_len+1]=0; | |
422 videobuffer[videobuf_len+2]=1; | |
423 videobuffer[videobuf_len+3]=0xFF; | |
424 videobuf_len+=4; | |
425 #endif | |
426 if(!i) return -1; // EOF | |
427 break; | |
428 } | |
429 } else { | |
8965 | 430 if(i==0x100){ |
431 pts=d_video->pts; | |
432 d_video->pts=0; | |
433 } | |
2567 | 434 //if(i==0x100) in_frame=1; // picture startcode |
435 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
436 else if(!i) return -1; // EOF | |
437 } | |
438 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; | |
439 if(!read_video_packet(d_video)) return -1; // EOF | |
440 //printf("read packet 0x%X, len=%d\n",i,videobuf_len); | |
441 // process headers: | |
442 switch(i){ | |
4074 | 443 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break; |
444 case 0x1B5: mp_header_process_extension (&picture, &videobuffer[start]);break; | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
445 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break; |
8965 | 446 case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break; |
2567 | 447 } |
448 } | |
449 | |
450 // if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug | |
451 //printf("--- SEND %d bytes\n",videobuf_len); | |
452 // if(grab_frames==1){ | |
453 // FILE *f=fopen("grab.mpg","ab"); | |
454 // fwrite(videobuffer,videobuf_len-4,1,f); | |
455 // fclose(f); | |
456 // } | |
457 | |
458 *start=videobuffer; in_size=videobuf_len; | |
459 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
460 | |
461 #if 1 | |
462 // get mpeg fps: | |
463 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
464 if(sh_video->fps!=picture.fps) if(!force_fps && !telecine){ |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
465 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,picture.fps,sh_video->fps-picture.fps,picture.frame_rate_code); |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
466 sh_video->fps=picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
467 sh_video->frametime=1.0/picture.fps; |
2567 | 468 } |
469 #endif | |
470 | |
471 // fix mpeg2 frametime: | |
472 frame_time=(picture.display_time)*0.01f; | |
473 picture.display_time=100; | |
474 videobuf_len=0; | |
475 | |
8967 | 476 telecine_cnt*=0.9; // drift out error |
477 telecine_cnt+=frame_time-5.0/4.0; | |
9221 | 478 mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"\r telecine = %3.1f %5.3f \n",frame_time,telecine_cnt); |
8967 | 479 |
480 if(telecine){ | |
481 frame_time=1; | |
482 if(telecine_cnt<-1.5 || telecine_cnt>1.5){ | |
483 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_LeaveTelecineMode); | |
484 telecine=0; | |
485 } | |
486 } else | |
487 if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){ | |
488 sh_video->fps=sh_video->fps*4/5; | |
489 sh_video->frametime=sh_video->frametime*5/4; | |
11385 | 490 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode); |
8967 | 491 telecine=1; |
492 } | |
493 | |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
494 } else if((demuxer->file_format==DEMUXER_TYPE_MPEG4_ES) || ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000004)) || |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
495 ((demuxer->file_format==DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000004)) |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
496 ){ |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
497 // |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
498 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
499 int i=sync_video_packet(d_video); |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
500 if(!i) return -1; |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
501 if(!read_video_packet(d_video)) return -1; // EOF |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
502 if(i==0x1B6) break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
503 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
504 *start=videobuffer; in_size=videobuf_len; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
505 videobuf_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
506 |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
507 } else if(demuxer->file_format==DEMUXER_TYPE_H264_ES || ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000005)) || |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
508 ((demuxer->file_format==DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000005)) |
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
509 ){ |
9824 | 510 // |
16505
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
511 int in_picture = 0; |
9824 | 512 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ |
513 int i=sync_video_packet(d_video); | |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
514 int pos = videobuf_len+4; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
515 if(!i) return -1; |
9824 | 516 if(!read_video_packet(d_video)) return -1; // EOF |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
517 if((i&~0x60) == 0x107 && i != 0x107) { |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
518 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos); |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
519 if(picture.fps > 0) { |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
520 sh_video->fps=picture.fps; |
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
14923
diff
changeset
|
521 sh_video->frametime=1.0/picture.fps; |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
522 } |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
523 i=sync_video_packet(d_video); |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
524 if(!i) return -1; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
525 if(!read_video_packet(d_video)) return -1; // EOF |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
526 } |
16505
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
527 |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
528 // here starts the access unit end detection code |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
529 // see the mail on MPlayer-dev-eng for details: |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
530 // Date: Sat, 17 Sep 2005 11:24:06 +0200 |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
531 // Subject: Re: [MPlayer-dev-eng] [RFC] h264 ES parser problems |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
532 // Message-ID: <20050917092406.GA7699@rz.uni-karlsruhe.de> |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
533 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
534 // found VCL NAL with slice header i.e. start of current primary coded |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
535 // picture, so start scanning for the end now |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
536 in_picture = 1; |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
537 if (in_picture) { |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
538 i = sync_video_packet(d_video) & ~0x60; // code of next packet |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
539 if(i == 0x106 || i == 0x109) break; // SEI or access unit delim. |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
540 if(i == 0x101 || i == 0x102 || i == 0x105) { |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
541 // assuming arbitrary slice ordering is not allowed, the |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
542 // first_mb_in_slice (golomb encoded) value should be 0 then |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
543 // for the first VCL NAL in a picture |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
544 if (demux_peekc(d_video) & 0x80) |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
545 break; |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
546 } |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
547 } |
9824 | 548 } |
549 *start=videobuffer; in_size=videobuf_len; | |
550 videobuf_len=0; | |
551 | |
2567 | 552 } else { |
553 // frame-based file formats: (AVI,ASF,MOV) | |
554 in_size=ds_get_packet(d_video,start); | |
555 if(in_size<0) return -1; // EOF | |
556 // if(in_size>max_framesize) max_framesize=in_size; | |
557 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
558 } | |
559 | |
560 // vdecode_time=video_time_usage-vdecode_time; | |
561 | |
562 //------------------------ frame decoded. -------------------- | |
563 | |
564 // Increase video timers: | |
565 sh_video->num_frames+=frame_time; | |
566 ++sh_video->num_frames_decoded; | |
567 | |
568 frame_time*=sh_video->frametime; | |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
569 |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
570 // override frame_time for variable/unknown FPS formats: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
571 if(!force_fps) switch(demuxer->file_format){ |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
572 case DEMUXER_TYPE_GIF: |
10434
dd64e1fe919d
Better support for RealVideo/RealAudio in Matroska. Includes the timestamp fixes from demux_real.c. Seeking is working. Added Matroska to the formats with variable FPS in video.c.
mosu
parents:
10263
diff
changeset
|
573 case DEMUXER_TYPE_MATROSKA: |
6423 | 574 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) |
575 frame_time=d_video->pts-pts1; | |
576 break; | |
6571 | 577 #ifdef USE_TV |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
578 case DEMUXER_TYPE_TV: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
579 #endif |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
580 case DEMUXER_TYPE_MOV: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
581 case DEMUXER_TYPE_FILM: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
582 case DEMUXER_TYPE_VIVO: |
18394 | 583 case DEMUXER_TYPE_OGG: |
17960 | 584 case DEMUXER_TYPE_REAL: |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
585 case DEMUXER_TYPE_ASF: { |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
586 float next_pts = ds_get_next_pts(d_video); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
587 float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; |
6371
622d57683187
Fix asf stream wich were giving invalid frame times because the frame time
albeu
parents:
5930
diff
changeset
|
588 if(d>=0){ |
6423 | 589 if(d>0){ |
18394 | 590 /* 10000 is used for OGM only */ |
591 if((int)sh_video->fps==1000||(int)sh_video->fps==10000) | |
6423 | 592 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); |
593 sh_video->frametime=d; // 1ms | |
594 sh_video->fps=1.0f/d; | |
595 } | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
596 frame_time = d; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
597 } else { |
6423 | 598 mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time); |
599 // frame_time = 1/25.0; | |
2567 | 600 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
601 } |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
602 break; |
12170 | 603 case DEMUXER_TYPE_LAVF: |
604 if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ | |
605 float next_pts = ds_get_next_pts(d_video); | |
606 float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; | |
607 if(d>=0){ | |
608 frame_time = d; | |
609 } | |
610 } | |
611 break; | |
2567 | 612 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
613 |
4705 | 614 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
16314 | 615 demuxer->file_format==DEMUXER_TYPE_MPEG_PES || |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
616 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || |
10263 | 617 demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |
618 demuxer->file_format==DEMUXER_TYPE_MPEG_TY){ | |
8965 | 619 |
620 // if(pts>0.0001) printf("\r!!! pts: %5.3f [%d] (%5.3f) \n",pts,picture_coding_type,i_pts); | |
621 | |
622 sh_video->pts+=frame_time; | |
623 if(picture_coding_type<=2 && sh_video->i_pts){ | |
624 // printf("XXX predict: %5.3f pts: %5.3f error=%5.5f \n",i_pts,d_video->pts2,i_pts-d_video->pts2); | |
625 sh_video->pts=sh_video->i_pts; | |
626 sh_video->i_pts=pts; | |
627 } else { | |
628 if(pts){ | |
629 if(picture_coding_type<=2) sh_video->i_pts=pts; | |
630 else { | |
631 // printf("BBB predict: %5.3f pts: %5.3f error=%5.5f \n",pts,d_video->pts2,pts-d_video->pts2); | |
632 sh_video->pts=pts; | |
633 } | |
634 } | |
635 } | |
636 // printf("\rIII pts: %5.3f [%d] (%5.3f) \n",d_video->pts2,picture_coding_type,i_pts); | |
637 } else | |
638 sh_video->pts=d_video->pts; | |
2567 | 639 |
640 if(frame_time_ptr) *frame_time_ptr=frame_time; | |
641 return in_size; | |
642 | |
643 } | |
644 |