Mercurial > mplayer.hg
annotate libmpdemux/video.c @ 23371:04c9f3b7ae0c
synced with r23388
author | Gabrov |
---|---|
date | Sun, 27 May 2007 11:28:05 +0000 |
parents | 4d81dbdf46b9 |
children | 6511f42d799d |
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 | |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22173
diff
changeset
|
16 #include "stream/stream.h" |
2567 | 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, |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
52 VIDEO_VC1, |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
53 VIDEO_OTHER |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
54 } video_codec; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
55 |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
56 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
|
57 (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
|
58 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_GXF) || |
16314 | 59 (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
|
60 (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
|
61 (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
|
62 (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
|
63 #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
|
64 || ((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
|
65 #endif |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
66 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
67 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
|
68 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
|
69 ((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
|
70 ((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
|
71 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
72 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
|
73 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
|
74 ((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
|
75 ((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
|
76 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
77 video_codec = VIDEO_H264; |
22162 | 78 else if((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS || d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
79 video_codec = VIDEO_VC1; |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
80 else |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
81 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
|
82 |
2567 | 83 // 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
|
84 switch(video_codec){ |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
85 case VIDEO_OTHER: { |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
86 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
|
87 // display info: |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
88 sh_video->format=sh_video->bih->biCompression; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
89 |
2567 | 90 sh_video->disp_w=sh_video->bih->biWidth; |
91 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
|
92 |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
93 } |
2567 | 94 break; |
95 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
96 case VIDEO_MPEG4: { |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
97 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
|
98 videobuf_len=0; videobuf_code_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
99 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
|
100 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
101 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
102 if(i<=0x11F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
103 if(!i || !skip_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
104 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
105 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
106 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
107 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
108 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
109 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
110 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
|
111 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
|
112 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
113 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
114 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
115 } |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
116 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
117 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
|
118 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
119 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
|
120 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
|
121 if(i>=0x120 && i<=0x12F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
122 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
123 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
124 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
125 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
126 } |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
127 pos = videobuf_len+4; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
128 if(!read_video_packet(d_video)){ |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
129 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
|
130 return 0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
131 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
132 mp4_header_process_vol(&picture, &(videobuffer[pos])); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
133 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
|
134 mp4_init: |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
135 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
136 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
137 if(i==0x1B6) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
138 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
139 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
140 return 0; |
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 } |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
143 pos = videobuf_len+4; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
144 if(!read_video_packet(d_video)){ |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
145 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
|
146 return 0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
147 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
148 mp4_header_process_vop(&picture, &(videobuffer[pos])); |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
149 units[vop_cnt] = picture.timeinc_unit; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
150 vop_cnt++; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
151 //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
|
152 if(!picture.fps) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
153 int i, mn, md, mx, diff; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
154 if(vop_cnt < 3) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
155 goto mp4_init; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
156 |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
157 i=0; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
158 mn = mx = units[0]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
159 for(i=0; i<3; i++) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
160 if(units[i] < mn) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
161 mn = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
162 if(units[i] > mx) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
163 mx = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
164 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
165 md = mn; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
166 for(i=0; i<3; i++) { |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
167 if((units[i] > mn) && (units[i] < mx)) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
168 md = units[i]; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
169 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
170 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
|
171 if(mx - md > md - mn) |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
172 diff = md - mn; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
173 else |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
174 diff = mx - md; |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
175 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
|
176 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
|
177 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
|
178 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
179 } |
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
14034
diff
changeset
|
180 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
|
181 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
|
182 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
|
183 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
|
184 } |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
185 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
186 sh_video->format=0x10000004; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
187 break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
188 } |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
189 case VIDEO_H264: { |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
190 int pos = 0; |
9824 | 191 videobuf_len=0; videobuf_code_len=0; |
192 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence parameter set... ");fflush(stdout); | |
193 while(1){ | |
194 int i=sync_video_packet(d_video); | |
195 if((i&~0x60) == 0x107 && i != 0x107) break; // found it! | |
196 if(!i || !skip_video_packet(d_video)){ | |
197 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
198 return 0; | |
199 } | |
200 } | |
201 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
202 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
203 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
|
204 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
|
205 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
206 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
207 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
208 } |
9824 | 209 } |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
210 pos = videobuf_len+4; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
211 if(!read_video_packet(d_video)){ |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
212 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
|
213 return 0; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
214 } |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
215 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos); |
9824 | 216 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for picture parameter set... ");fflush(stdout); |
217 while(1){ | |
218 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
|
219 mp_msg(MSGT_DECVIDEO,MSGL_V,"H264: 0x%X\n",i); |
9824 | 220 if((i&~0x60) == 0x108 && i != 0x108) break; // found it! |
221 if(!i || !read_video_packet(d_video)){ | |
222 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
223 return 0; | |
224 } | |
225 } | |
226 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Slice... ");fflush(stdout); | |
227 while(1){ | |
228 int i=sync_video_packet(d_video); | |
229 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; // found it! | |
230 if(!i || !read_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"); | |
236 sh_video->format=0x10000005; | |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
237 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
|
238 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
|
239 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
|
240 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
|
241 } |
9824 | 242 break; |
243 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
244 case VIDEO_MPEG12: { |
17277
c568f01ef9f9
search next sequence_header untile a valid one is found
nicodvb
parents:
17226
diff
changeset
|
245 mpeg_header_parser: |
2567 | 246 // Find sequence_header first: |
247 videobuf_len=0; videobuf_code_len=0; | |
8967 | 248 telecine=0; telecine_cnt=-2.5; |
2567 | 249 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout); |
250 while(1){ | |
251 int i=sync_video_packet(d_video); | |
252 if(i==0x1B3) break; // found it! | |
253 if(!i || !skip_video_packet(d_video)){ | |
17932 | 254 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
2567 | 255 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); |
256 return 0; | |
257 } | |
258 } | |
259 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
260 // ========= Read & process sequence header & extension ============ | |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
261 if(!videobuffer) { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
262 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
|
263 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
|
264 else { |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
265 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
266 return 0; |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
267 } |
2567 | 268 } |
269 | |
270 if(!read_video_packet(d_video)){ | |
271 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); | |
272 return 0; | |
273 } | |
274 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { | |
275 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
|
276 goto mpeg_header_parser; |
2567 | 277 } |
278 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. | |
279 int pos=videobuf_len; | |
280 if(!read_video_packet(d_video)){ | |
281 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); | |
282 return 0; | |
283 } | |
284 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { | |
285 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); | |
286 return 0; | |
287 } | |
288 } | |
289 | |
290 // display info: | |
291 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
|
292 sh_video->fps=picture.fps; |
2567 | 293 if(!sh_video->fps){ |
294 sh_video->frametime=0; | |
295 } 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
|
296 sh_video->frametime=1.0/picture.fps; |
2567 | 297 } |
298 sh_video->disp_w=picture.display_picture_width; | |
299 sh_video->disp_h=picture.display_picture_height; | |
300 // bitrate: | |
301 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ? | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
302 sh_video->i_bps=picture.bitrate * 400 / 8; |
2567 | 303 // info: |
304 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate); | |
10709 | 305 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
2567 | 306 picture.mpeg1?"MPEG1":"MPEG2", |
307 sh_video->disp_w,sh_video->disp_h, | |
308 picture.aspect_ratio_information, | |
309 sh_video->fps, | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
310 sh_video->i_bps * 8 / 1000.0, |
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
311 sh_video->i_bps / 1000.0 ); |
2567 | 312 break; |
313 } | |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
314 case VIDEO_VC1: { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
315 // Find sequence_header: |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
316 videobuf_len=0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
317 videobuf_code_len=0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
318 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Searching for VC1 sequence header... "); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
319 while(1){ |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
320 int i=sync_video_packet(d_video); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
321 if(i==0x10F) break; // found it! |
21951
bd3c871c93d0
in vc1 probing code, all packets before the first sequence header must be skipped, not read
nicodvb
parents:
21950
diff
changeset
|
322 if(!i || !skip_video_packet(d_video)){ |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
323 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
324 mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Couldn't find VC-1 sequence header\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
325 return 0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
326 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
327 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
328 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"found\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
329 if(!videobuffer) { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
330 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
331 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
332 else { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
333 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
334 return 0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
335 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
336 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
337 if(!read_video_packet(d_video)){ |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
338 mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Couldn't read VC-1 sequence header!\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
339 return 0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
340 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
341 |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
342 while(1) { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
343 int i=sync_video_packet(d_video); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
344 if(i==0x10E) break; // found it! |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
345 if(!i || !skip_video_packet(d_video)){ |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
346 mp_msg(MSGT_DECVIDEO,MSGL_V,"Couldn't find VC-1 entry point sync-code:(\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
347 return 0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
348 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
349 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
350 if(!read_video_packet(d_video)){ |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
351 mp_msg(MSGT_DECVIDEO,MSGL_V,"Couldn't read VC-1 entry point sync-code:(\n"); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
352 return 0; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
353 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
354 |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
355 |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
356 if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) { |
21950
647f3be495eb
removed unused variables; replaced wrong call to realloc() with calloc() in vc1 probing code
nicodvb
parents:
21949
diff
changeset
|
357 sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len); |
21952
58d083ace2f2
vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents:
21951
diff
changeset
|
358 if(sh_video->bih == NULL) { |
58d083ace2f2
vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents:
21951
diff
changeset
|
359 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(BITMAPINFOHEADER) + videobuf_len); |
58d083ace2f2
vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents:
21951
diff
changeset
|
360 return 0; |
58d083ace2f2
vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents:
21951
diff
changeset
|
361 } |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
362 sh_video->bih->biSize= sizeof(BITMAPINFOHEADER) + videobuf_len; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
363 memcpy(sh_video->bih + 1, videobuffer, videobuf_len); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
364 sh_video->bih->biCompression = sh_video->format; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
365 sh_video->bih->biWidth = sh_video->disp_w = picture.display_picture_width; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
366 sh_video->bih->biHeight = sh_video->disp_h = picture.display_picture_height; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
367 if(picture.fps > 0) { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
368 sh_video->frametime=1.0/picture.fps; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
369 sh_video->fps = picture.fps; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
370 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
371 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: VC-1 %dx%d, %5.3f fps, header len: %d\n", |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
372 sh_video->disp_w, sh_video->disp_h, sh_video->fps, videobuf_len); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
373 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
374 break; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
375 } |
2567 | 376 } // switch(file_format) |
377 | |
378 return 1; | |
379 } | |
380 | |
10263 | 381 void ty_processuserdata( unsigned char* buf, int len ); |
382 | |
4074 | 383 static void process_userdata(unsigned char* buf,int len){ |
384 int i; | |
6791 | 385 /* if the user data starts with "CC", assume it is a CC info packet */ |
386 if(len>2 && buf[0]=='C' && buf[1]=='C'){ | |
387 // mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n"); | |
21236
3ec5917cdae2
Cleanup for uselessly complicated closed-caption subtitle handling
reimar
parents:
19802
diff
changeset
|
388 subcc_process_data(buf+2,len-2); |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
389 } |
10263 | 390 if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' ) |
391 { | |
392 ty_processuserdata( buf + 2, len - 2 ); | |
393 return; | |
394 } | |
7208 | 395 if(verbose<2) return; |
4074 | 396 printf( "user_data: len=%3d %02X %02X %02X %02X '", |
397 len, buf[0], buf[1], buf[2], buf[3]); | |
398 for(i=0;i<len;i++) | |
6791 | 399 // if(buf[i]>=32 && buf[i]<127) putchar(buf[i]); |
400 if(buf[i]&0x60) putchar(buf[i]&0x7F); | |
4074 | 401 printf("'\n"); |
402 } | |
403 | |
2567 | 404 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){ |
405 demux_stream_t *d_video=sh_video->ds; | |
406 demuxer_t *demuxer=d_video->demuxer; | |
407 float frame_time=1; | |
408 float pts1=d_video->pts; | |
8965 | 409 float pts=0; |
410 int picture_coding_type=0; | |
2567 | 411 int in_size=0; |
412 | |
413 *start=NULL; | |
414 | |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
415 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16184
diff
changeset
|
416 demuxer->file_format==DEMUXER_TYPE_MPEG_GXF || |
16314 | 417 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
|
418 (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
|
419 || 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
|
420 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
10263 | 421 || 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
|
422 #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
|
423 || (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
|
424 #endif |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
425 ){ |
2567 | 426 int in_frame=0; |
427 //float newfps; | |
428 //videobuf_len=0; | |
429 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
430 int i=sync_video_packet(d_video); | |
4074 | 431 //void* buffer=&videobuffer[videobuf_len+4]; |
432 int start=videobuf_len+4; | |
2567 | 433 if(in_frame){ |
434 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
435 if(!i) return -1; // EOF | |
436 break; | |
437 } | |
438 } else { | |
8965 | 439 if(i==0x100){ |
440 pts=d_video->pts; | |
441 d_video->pts=0; | |
442 } | |
2567 | 443 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode |
444 else if(!i) return -1; // EOF | |
445 } | |
446 if(!read_video_packet(d_video)) return -1; // EOF | |
447 // process headers: | |
448 switch(i){ | |
4074 | 449 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break; |
450 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
|
451 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break; |
8965 | 452 case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break; |
2567 | 453 } |
454 } | |
455 | |
456 *start=videobuffer; in_size=videobuf_len; | |
457 | |
458 #if 1 | |
459 // get mpeg 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
|
460 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
|
461 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
|
462 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
|
463 sh_video->frametime=1.0/picture.fps; |
2567 | 464 } |
465 #endif | |
466 | |
467 // fix mpeg2 frametime: | |
468 frame_time=(picture.display_time)*0.01f; | |
469 picture.display_time=100; | |
470 videobuf_len=0; | |
471 | |
8967 | 472 telecine_cnt*=0.9; // drift out error |
473 telecine_cnt+=frame_time-5.0/4.0; | |
9221 | 474 mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"\r telecine = %3.1f %5.3f \n",frame_time,telecine_cnt); |
8967 | 475 |
476 if(telecine){ | |
477 frame_time=1; | |
478 if(telecine_cnt<-1.5 || telecine_cnt>1.5){ | |
479 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_LeaveTelecineMode); | |
480 telecine=0; | |
481 } | |
482 } else | |
483 if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){ | |
484 sh_video->fps=sh_video->fps*4/5; | |
485 sh_video->frametime=sh_video->frametime*5/4; | |
11385 | 486 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode); |
8967 | 487 telecine=1; |
488 } | |
489 | |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
490 } 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
|
491 ((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
|
492 ){ |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
493 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
|
494 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
|
495 if(!i) return -1; |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
496 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
|
497 if(i==0x1B6) break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
498 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
499 *start=videobuffer; in_size=videobuf_len; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
500 videobuf_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
501 |
14923
658fc109eefc
added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
nicodvb
parents:
14798
diff
changeset
|
502 } 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
|
503 ((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
|
504 ){ |
16505
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
505 int in_picture = 0; |
9824 | 506 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ |
507 int i=sync_video_packet(d_video); | |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
508 int pos = videobuf_len+4; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
509 if(!i) return -1; |
9824 | 510 if(!read_video_packet(d_video)) return -1; // EOF |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
511 if((i&~0x60) == 0x107 && i != 0x107) { |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
512 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos); |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
513 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
|
514 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
|
515 sh_video->frametime=1.0/picture.fps; |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
516 } |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
517 i=sync_video_packet(d_video); |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
518 if(!i) return -1; |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
519 if(!read_video_packet(d_video)) return -1; // EOF |
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
520 } |
16505
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
521 |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
522 // here starts the access unit end detection code |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
523 // 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
|
524 // 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
|
525 // 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
|
526 // Message-ID: <20050917092406.GA7699@rz.uni-karlsruhe.de> |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
527 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
|
528 // 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
|
529 // picture, so start scanning for the end now |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
530 in_picture = 1; |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
531 if (in_picture) { |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
532 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
|
533 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
|
534 if(i == 0x101 || i == 0x102 || i == 0x105) { |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
535 // assuming arbitrary slice ordering is not allowed, the |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
536 // 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
|
537 // for the first VCL NAL in a picture |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
538 if (demux_peekc(d_video) & 0x80) |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
539 break; |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
540 } |
cb6599e433d7
Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents:
16314
diff
changeset
|
541 } |
9824 | 542 } |
543 *start=videobuffer; in_size=videobuf_len; | |
544 videobuf_len=0; | |
545 | |
22162 | 546 } else if((demuxer->file_format==DEMUXER_TYPE_MPEG_PS || demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) { |
21949
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
547 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE) { |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
548 int i=sync_video_packet(d_video); |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
549 if(!i) return -1; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
550 if(!read_video_packet(d_video)) return -1; // EOF |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
551 if(i==0x10D) break; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
552 } |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
553 *start=videobuffer; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
554 in_size=videobuf_len; |
202327a68635
decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents:
21809
diff
changeset
|
555 videobuf_len=0; |
2567 | 556 } else { |
557 // frame-based file formats: (AVI,ASF,MOV) | |
558 in_size=ds_get_packet(d_video,start); | |
559 if(in_size<0) return -1; // EOF | |
560 } | |
561 | |
562 | |
563 //------------------------ frame decoded. -------------------- | |
564 | |
565 // Increase video timers: | |
566 sh_video->num_frames+=frame_time; | |
567 ++sh_video->num_frames_decoded; | |
568 | |
569 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
|
570 |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
571 // 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
|
572 if(!force_fps) switch(demuxer->file_format){ |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
573 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
|
574 case DEMUXER_TYPE_MATROSKA: |
6423 | 575 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) |
576 frame_time=d_video->pts-pts1; | |
577 break; | |
6571 | 578 #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
|
579 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
|
580 #endif |
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_MOV: |
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_FILM: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
583 case DEMUXER_TYPE_VIVO: |
19802
f1655de446c4
Support for variable fps OGM files, blessed by Moritz.
diego
parents:
19695
diff
changeset
|
584 case DEMUXER_TYPE_OGG: |
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: { |
21809
2c473e083c70
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
reimar
parents:
21236
diff
changeset
|
586 double next_pts = ds_get_next_pts(d_video); |
2c473e083c70
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
reimar
parents:
21236
diff
changeset
|
587 double d= (next_pts != MP_NOPTS_VALUE) ? 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){ |
19082
a2f20562aac3
Remove support for obsolete and non-free divx4/odivx libraries.
diego
parents:
18942
diff
changeset
|
590 if((int)sh_video->fps==1000) |
6423 | 591 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); |
592 sh_video->frametime=d; // 1ms | |
593 sh_video->fps=1.0f/d; | |
594 } | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
595 frame_time = d; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
596 } else { |
6423 | 597 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); |
598 // frame_time = 1/25.0; | |
2567 | 599 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
600 } |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
601 break; |
12170 | 602 case DEMUXER_TYPE_LAVF: |
603 if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ | |
21809
2c473e083c70
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
reimar
parents:
21236
diff
changeset
|
604 double next_pts = ds_get_next_pts(d_video); |
2c473e083c70
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
reimar
parents:
21236
diff
changeset
|
605 double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1; |
12170 | 606 if(d>=0){ |
607 frame_time = d; | |
608 } | |
609 } | |
610 break; | |
18942
cf05a9897d1b
Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents:
18873
diff
changeset
|
611 case DEMUXER_TYPE_REAL: |
cf05a9897d1b
Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents:
18873
diff
changeset
|
612 { |
19695 | 613 double next_pts = ds_get_next_pts(d_video); |
21809
2c473e083c70
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
reimar
parents:
21236
diff
changeset
|
614 double d = (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts - pts1; |
18942
cf05a9897d1b
Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents:
18873
diff
changeset
|
615 |
19655
bddd0b58efb6
Workaround for live Real streams starting with nonzero pts
rtogni
parents:
19082
diff
changeset
|
616 frame_time = (d >= 0 && pts1 > 0) ? d : 0.001; |
18942
cf05a9897d1b
Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents:
18873
diff
changeset
|
617 } |
cf05a9897d1b
Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents:
18873
diff
changeset
|
618 break; |
2567 | 619 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
620 |
4705 | 621 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
16314 | 622 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
|
623 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || |
10263 | 624 demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |
625 demuxer->file_format==DEMUXER_TYPE_MPEG_TY){ | |
8965 | 626 |
627 | |
628 sh_video->pts+=frame_time; | |
629 if(picture_coding_type<=2 && sh_video->i_pts){ | |
630 sh_video->pts=sh_video->i_pts; | |
631 sh_video->i_pts=pts; | |
632 } else { | |
633 if(pts){ | |
634 if(picture_coding_type<=2) sh_video->i_pts=pts; | |
635 else { | |
636 sh_video->pts=pts; | |
637 } | |
638 } | |
639 } | |
640 } else | |
641 sh_video->pts=d_video->pts; | |
2567 | 642 |
643 if(frame_time_ptr) *frame_time_ptr=frame_time; | |
644 return in_size; | |
645 | |
646 } | |
647 |