Mercurial > mplayer.hg
annotate libmpdemux/video.c @ 14187:19589e978000
10l fix I hope, reverse if not
author | alex |
---|---|
date | Sun, 19 Dec 2004 16:53:26 +0000 |
parents | 7ac60a1c576e |
children | 92553e3c8f01 |
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)*/ |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
23 #include "../sub_cc.h" |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
24 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
25 /* biCompression constant */ |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
26 #define BI_RGB 0L |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
27 |
9457
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
28 #ifdef STREAMING_LIVE_DOT_COM |
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
29 #include "demux_rtp.h" |
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
30 #endif |
ea1c0a4520bf
Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>
bertrand
parents:
9221
diff
changeset
|
31 |
2567 | 32 static mp_mpeg_header_t picture; |
33 | |
8967 | 34 static int telecine=0; |
35 static float telecine_cnt=-2.5; | |
36 | |
2567 | 37 int video_read_properties(sh_video_t *sh_video){ |
38 demux_stream_t *d_video=sh_video->ds; | |
39 | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
40 enum { |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
41 VIDEO_MPEG12, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
42 VIDEO_MPEG4, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
43 VIDEO_H264, |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
44 VIDEO_OTHER |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
45 } video_codec; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
46 |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
47 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
|
48 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
49 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS) || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
50 (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
|
51 (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
52 #ifdef STREAMING_LIVE_DOT_COM |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
53 || ((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
|
54 #endif |
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 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
|
57 else if((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG4_ES) || |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
58 ((d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000004)) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
59 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
60 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
|
61 else if((d_video->demuxer->file_format == DEMUXER_TYPE_H264_ES) || |
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==0x10000005)) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
63 ) |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
64 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
|
65 else |
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_OTHER; |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
67 |
2567 | 68 // 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
|
69 switch(video_codec){ |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
70 case VIDEO_OTHER: { |
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
71 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
|
72 // display info: |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
73 |
5898 | 74 #if 0 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
75 if(sh_video->bih->biCompression == BI_RGB && |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
76 (sh_video->video.fccHandler == mmioFOURCC('D', 'I', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
77 sh_video->video.fccHandler == mmioFOURCC('R', 'G', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
78 sh_video->video.fccHandler == mmioFOURCC('R', 'A', 'W', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
79 sh_video->video.fccHandler == 0)) { |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
80 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
|
81 } |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
82 else |
5898 | 83 #endif |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
84 sh_video->format=sh_video->bih->biCompression; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
85 |
2567 | 86 sh_video->disp_w=sh_video->bih->biWidth; |
87 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
|
88 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
89 #if 1 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
90 /* 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
|
91 if ((sh_video->format == 0x10000001) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
92 (sh_video->format == 0x10000002) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
93 (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
|
94 (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
|
95 (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
|
96 (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
|
97 (sh_video->format == mmioFOURCC('m','p','e','g')) || |
7302
7d32189dbae4
typo (checking for mpeg twice, instead of mpeg & MPEG)
michael
parents:
7208
diff
changeset
|
98 (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
|
99 { |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
100 int saved_pos, saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
101 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
102 /* 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
|
103 reading the mpeg header self! */ |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
104 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
105 saved_pos = d_video->buffer_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
106 saved_type = d_video->demuxer->file_format; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
107 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
108 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
|
109 video_read_properties(sh_video); |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
110 d_video->demuxer->file_format = saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
111 d_video->buffer_pos = saved_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
112 // goto mpeg_header_parser; |
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 #endif |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
115 } |
2567 | 116 break; |
117 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
118 case VIDEO_MPEG4: { |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
119 videobuf_len=0; videobuf_code_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
120 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
|
121 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
122 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
123 if(i<=0x11F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
124 if(!i || !skip_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
125 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
126 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
127 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
128 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
129 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
130 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
131 if(!videobuffer){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
132 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
133 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
134 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
135 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
|
136 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
137 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
|
138 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
|
139 if(i>=0x120 && i<=0x12F) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
140 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
141 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
142 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
143 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
144 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
145 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Video Object Plane Start code... ");fflush(stdout); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
146 while(1){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
147 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
148 if(i==0x1B6) break; // found it! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
149 if(!i || !read_video_packet(d_video)){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
150 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
151 return 0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
152 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
153 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
154 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
155 sh_video->format=0x10000004; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
156 break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
157 } |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
158 case VIDEO_H264: { |
9824 | 159 videobuf_len=0; videobuf_code_len=0; |
160 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence parameter set... ");fflush(stdout); | |
161 while(1){ | |
162 int i=sync_video_packet(d_video); | |
163 if((i&~0x60) == 0x107 && i != 0x107) break; // found it! | |
164 if(!i || !skip_video_packet(d_video)){ | |
165 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
166 return 0; | |
167 } | |
168 } | |
169 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
170 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); | |
171 if(!videobuffer){ | |
172 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); | |
173 return 0; | |
174 } | |
175 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for picture parameter set... ");fflush(stdout); | |
176 while(1){ | |
177 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
|
178 mp_msg(MSGT_DECVIDEO,MSGL_V,"H264: 0x%X\n",i); |
9824 | 179 if((i&~0x60) == 0x108 && i != 0x108) break; // found it! |
180 if(!i || !read_video_packet(d_video)){ | |
181 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
182 return 0; | |
183 } | |
184 } | |
185 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Slice... ");fflush(stdout); | |
186 while(1){ | |
187 int i=sync_video_packet(d_video); | |
188 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; // found it! | |
189 if(!i || !read_video_packet(d_video)){ | |
190 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
191 return 0; | |
192 } | |
193 } | |
194 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
195 sh_video->format=0x10000005; | |
196 break; | |
197 } | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
198 case VIDEO_MPEG12: { |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
199 //mpeg_header_parser: |
2567 | 200 // Find sequence_header first: |
201 videobuf_len=0; videobuf_code_len=0; | |
8967 | 202 telecine=0; telecine_cnt=-2.5; |
2567 | 203 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout); |
204 while(1){ | |
205 int i=sync_video_packet(d_video); | |
206 if(i==0x1B3) break; // found it! | |
207 if(!i || !skip_video_packet(d_video)){ | |
8027 | 208 if(verbose>0) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
2567 | 209 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); |
210 return 0; | |
211 } | |
212 } | |
213 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
214 // sh_video=d_video->sh;sh_video->ds=d_video; | |
215 // mpeg2_init(); | |
216 // ========= Read & process sequence header & extension ============ | |
217 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); | |
218 if(!videobuffer){ | |
219 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); | |
220 return 0; | |
221 } | |
222 | |
223 if(!read_video_packet(d_video)){ | |
224 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); | |
225 return 0; | |
226 } | |
227 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { | |
228 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); | |
229 return 0; | |
230 } | |
231 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. | |
232 // videobuf_len=0; | |
233 int pos=videobuf_len; | |
234 if(!read_video_packet(d_video)){ | |
235 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); | |
236 return 0; | |
237 } | |
238 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { | |
239 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); | |
240 return 0; | |
241 } | |
242 } | |
243 | |
244 // printf("picture.fps=%d\n",picture.fps); | |
245 | |
246 // fill aspect info: | |
247 switch(picture.aspect_ratio_information){ | |
248 case 2: // PAL/NTSC SVCD/DVD 4:3 | |
249 case 8: // PAL VCD 4:3 | |
250 case 12: // NTSC VCD 4:3 | |
251 sh_video->aspect=4.0/3.0; | |
252 break; | |
253 case 3: // PAL/NTSC Widescreen SVCD/DVD 16:9 | |
3666 | 254 case 6: // (PAL?)/NTSC Widescreen SVCD 16:9 |
2567 | 255 sh_video->aspect=16.0/9.0; |
256 break; | |
11833 | 257 case 4: // according to ISO-138182-2 Table 6.3 |
258 sh_video->aspect=2.21; | |
259 break; | |
4336 | 260 case 9: // Movie Type ??? / 640x480 |
261 sh_video->aspect=0.0; | |
262 break; | |
2567 | 263 default: |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
264 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Detected unknown aspect_ratio_information in mpeg sequence header.\n" |
2567 | 265 "Please report the aspect value (%i) along with the movie type (VGA,PAL,NTSC," |
266 "SECAM) and the movie resolution (720x576,352x240,480x480,...) to the MPlayer" | |
267 " developers, so that we can add support for it!\nAssuming 1:1 aspect for now.\n", | |
268 picture.aspect_ratio_information); | |
269 case 1: // VGA 1:1 - do not prescale | |
270 sh_video->aspect=0.0; | |
271 break; | |
272 } | |
273 // display info: | |
274 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video | |
275 sh_video->fps=picture.fps*0.0001f; | |
276 if(!sh_video->fps){ | |
277 // if(!force_fps){ | |
278 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n"); | |
279 // return 0; | |
280 // } | |
281 sh_video->frametime=0; | |
282 } else { | |
283 sh_video->frametime=10000.0f/(float)picture.fps; | |
284 } | |
285 sh_video->disp_w=picture.display_picture_width; | |
286 sh_video->disp_h=picture.display_picture_height; | |
287 // bitrate: | |
288 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ? | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
289 sh_video->i_bps=picture.bitrate * 400 / 8; |
2567 | 290 // info: |
291 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate); | |
10709 | 292 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
2567 | 293 picture.mpeg1?"MPEG1":"MPEG2", |
294 sh_video->disp_w,sh_video->disp_h, | |
295 picture.aspect_ratio_information, | |
296 sh_video->fps, | |
9606
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
297 sh_video->i_bps * 8 / 1000.0, |
0197c1e933fe
This patch corrects the calculation of the MPEG bitrate from the
arpi
parents:
9457
diff
changeset
|
298 sh_video->i_bps / 1000.0 ); |
2567 | 299 break; |
300 } | |
301 } // switch(file_format) | |
302 | |
303 return 1; | |
304 } | |
305 | |
10263 | 306 void ty_processuserdata( unsigned char* buf, int len ); |
307 | |
4074 | 308 static void process_userdata(unsigned char* buf,int len){ |
309 int i; | |
6791 | 310 /* if the user data starts with "CC", assume it is a CC info packet */ |
311 if(len>2 && buf[0]=='C' && buf[1]=='C'){ | |
312 // 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
|
313 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
|
314 } |
10263 | 315 if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' ) |
316 { | |
317 ty_processuserdata( buf + 2, len - 2 ); | |
318 return; | |
319 } | |
7208 | 320 if(verbose<2) return; |
4074 | 321 printf( "user_data: len=%3d %02X %02X %02X %02X '", |
322 len, buf[0], buf[1], buf[2], buf[3]); | |
323 for(i=0;i<len;i++) | |
6791 | 324 // if(buf[i]>=32 && buf[i]<127) putchar(buf[i]); |
325 if(buf[i]&0x60) putchar(buf[i]&0x7F); | |
4074 | 326 printf("'\n"); |
327 } | |
328 | |
2567 | 329 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){ |
330 demux_stream_t *d_video=sh_video->ds; | |
331 demuxer_t *demuxer=d_video->demuxer; | |
332 float frame_time=1; | |
333 float pts1=d_video->pts; | |
8965 | 334 float pts=0; |
335 int picture_coding_type=0; | |
2567 | 336 // unsigned char* start=NULL; |
337 int in_size=0; | |
338 | |
339 *start=NULL; | |
340 | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
341 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
342 || 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
|
343 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) |
10263 | 344 || demuxer->file_format==DEMUXER_TYPE_MPEG_TY |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
345 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
346 || (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
|
347 #endif |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
348 ){ |
2567 | 349 int in_frame=0; |
350 //float newfps; | |
351 //videobuf_len=0; | |
352 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
353 int i=sync_video_packet(d_video); | |
4074 | 354 //void* buffer=&videobuffer[videobuf_len+4]; |
355 int start=videobuf_len+4; | |
2567 | 356 if(in_frame){ |
357 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
7465 | 358 #if 0 |
2567 | 359 // send END OF FRAME code: |
360 videobuffer[videobuf_len+0]=0; | |
361 videobuffer[videobuf_len+1]=0; | |
362 videobuffer[videobuf_len+2]=1; | |
363 videobuffer[videobuf_len+3]=0xFF; | |
364 videobuf_len+=4; | |
365 #endif | |
366 if(!i) return -1; // EOF | |
367 break; | |
368 } | |
369 } else { | |
8965 | 370 if(i==0x100){ |
371 pts=d_video->pts; | |
372 d_video->pts=0; | |
373 } | |
2567 | 374 //if(i==0x100) in_frame=1; // picture startcode |
375 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
376 else if(!i) return -1; // EOF | |
377 } | |
378 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; | |
379 if(!read_video_packet(d_video)) return -1; // EOF | |
380 //printf("read packet 0x%X, len=%d\n",i,videobuf_len); | |
381 // process headers: | |
382 switch(i){ | |
4074 | 383 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break; |
384 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
|
385 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break; |
8965 | 386 case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break; |
2567 | 387 } |
388 } | |
389 | |
390 // if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug | |
391 //printf("--- SEND %d bytes\n",videobuf_len); | |
392 // if(grab_frames==1){ | |
393 // FILE *f=fopen("grab.mpg","ab"); | |
394 // fwrite(videobuffer,videobuf_len-4,1,f); | |
395 // fclose(f); | |
396 // } | |
397 | |
398 *start=videobuffer; in_size=videobuf_len; | |
399 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
400 | |
401 #if 1 | |
402 // get mpeg fps: | |
403 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
8967 | 404 if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps && !telecine){ |
2567 | 405 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,picture.fps*0.0001,sh_video->fps-picture.fps*0.0001,picture.frame_rate_code); |
406 sh_video->fps=picture.fps*0.0001; | |
407 sh_video->frametime=10000.0f/(float)picture.fps; | |
408 } | |
409 #endif | |
410 | |
411 // fix mpeg2 frametime: | |
412 frame_time=(picture.display_time)*0.01f; | |
413 picture.display_time=100; | |
414 videobuf_len=0; | |
415 | |
8967 | 416 telecine_cnt*=0.9; // drift out error |
417 telecine_cnt+=frame_time-5.0/4.0; | |
9221 | 418 mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"\r telecine = %3.1f %5.3f \n",frame_time,telecine_cnt); |
8967 | 419 |
420 if(telecine){ | |
421 frame_time=1; | |
422 if(telecine_cnt<-1.5 || telecine_cnt>1.5){ | |
423 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_LeaveTelecineMode); | |
424 telecine=0; | |
425 } | |
426 } else | |
427 if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){ | |
428 sh_video->fps=sh_video->fps*4/5; | |
429 sh_video->frametime=sh_video->frametime*5/4; | |
11385 | 430 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode); |
8967 | 431 telecine=1; |
432 } | |
433 | |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
434 } else if((demuxer->file_format==DEMUXER_TYPE_MPEG4_ES) || ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000004))){ |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
435 // |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
436 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
|
437 int i=sync_video_packet(d_video); |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
438 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
|
439 if(i==0x1B6) break; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
440 } |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
441 *start=videobuffer; in_size=videobuf_len; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
442 videobuf_len=0; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8967
diff
changeset
|
443 |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
444 } else if(demuxer->file_format==DEMUXER_TYPE_H264_ES || ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000005))){ |
9824 | 445 // |
446 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
447 int i=sync_video_packet(d_video); | |
448 if(!read_video_packet(d_video)) return -1; // EOF | |
449 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; | |
450 } | |
451 *start=videobuffer; in_size=videobuf_len; | |
452 videobuf_len=0; | |
453 | |
2567 | 454 } else { |
455 // frame-based file formats: (AVI,ASF,MOV) | |
456 in_size=ds_get_packet(d_video,start); | |
457 if(in_size<0) return -1; // EOF | |
458 // if(in_size>max_framesize) max_framesize=in_size; | |
459 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
460 } | |
461 | |
462 // vdecode_time=video_time_usage-vdecode_time; | |
463 | |
464 //------------------------ frame decoded. -------------------- | |
465 | |
466 // Increase video timers: | |
467 sh_video->num_frames+=frame_time; | |
468 ++sh_video->num_frames_decoded; | |
469 | |
470 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
|
471 |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
472 // 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
|
473 if(!force_fps) switch(demuxer->file_format){ |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
474 case DEMUXER_TYPE_GIF: |
6423 | 475 case DEMUXER_TYPE_REAL: |
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
|
476 case DEMUXER_TYPE_MATROSKA: |
6423 | 477 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) |
478 frame_time=d_video->pts-pts1; | |
479 break; | |
6571 | 480 #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
|
481 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
|
482 #endif |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
483 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
|
484 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
|
485 case DEMUXER_TYPE_VIVO: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
486 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
|
487 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
|
488 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
|
489 if(d>=0){ |
6423 | 490 if(d>0){ |
2567 | 491 if((int)sh_video->fps==1000) |
6423 | 492 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); |
493 sh_video->frametime=d; // 1ms | |
494 sh_video->fps=1.0f/d; | |
495 } | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
496 frame_time = d; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
497 } else { |
6423 | 498 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); |
499 // frame_time = 1/25.0; | |
2567 | 500 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
501 } |
9693
1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents:
9610
diff
changeset
|
502 break; |
12170 | 503 case DEMUXER_TYPE_LAVF: |
504 if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ | |
505 float next_pts = ds_get_next_pts(d_video); | |
506 float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; | |
507 if(d>=0){ | |
508 frame_time = d; | |
509 } | |
510 } | |
511 break; | |
2567 | 512 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
513 |
4705 | 514 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
14034
7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents:
12170
diff
changeset
|
515 ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) || |
10263 | 516 demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |
517 demuxer->file_format==DEMUXER_TYPE_MPEG_TY){ | |
8965 | 518 |
519 // if(pts>0.0001) printf("\r!!! pts: %5.3f [%d] (%5.3f) \n",pts,picture_coding_type,i_pts); | |
520 | |
521 sh_video->pts+=frame_time; | |
522 if(picture_coding_type<=2 && sh_video->i_pts){ | |
523 // printf("XXX predict: %5.3f pts: %5.3f error=%5.5f \n",i_pts,d_video->pts2,i_pts-d_video->pts2); | |
524 sh_video->pts=sh_video->i_pts; | |
525 sh_video->i_pts=pts; | |
526 } else { | |
527 if(pts){ | |
528 if(picture_coding_type<=2) sh_video->i_pts=pts; | |
529 else { | |
530 // printf("BBB predict: %5.3f pts: %5.3f error=%5.5f \n",pts,d_video->pts2,pts-d_video->pts2); | |
531 sh_video->pts=pts; | |
532 } | |
533 } | |
534 } | |
535 // printf("\rIII pts: %5.3f [%d] (%5.3f) \n",d_video->pts2,picture_coding_type,i_pts); | |
536 } else | |
537 sh_video->pts=d_video->pts; | |
2567 | 538 |
539 if(frame_time_ptr) *frame_time_ptr=frame_time; | |
540 return in_size; | |
541 | |
542 } | |
543 |