annotate libmpdemux/video.c @ 25376:382aeacc771f

The buffer used for pread need be aligned, but currently it got an offset 23 to the structure head. This will cause the pread always got random data on some machines (such as my iMac G5 PPC with 10.5 os) so can not play vcd. I also tried use DKIOCCDREAD ioctl call, but the result is same -- buffer need be aligned. It could be a bug of os x or its dev lib. Now fix this problem by move the buffer to a good aligned position in structure.
author ulion
date Sat, 15 Dec 2007 12:17:51 +0000
parents 384aa7179c9c
children 1318e956c092
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
1 // read video frame
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
2
2775
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
3 #include "config.h"
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
4
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
5 #include <stdio.h>
2775
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
6 #ifdef HAVE_MALLOC_H
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
7 #include <malloc.h>
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
8 #endif
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
9 #include <stdlib.h>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3666
diff changeset
10 #include <string.h>
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
11 #include <unistd.h>
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
12
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
13 #include "mp_msg.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
14 #include "help_mp.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
15
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22173
diff changeset
16 #include "stream/stream.h"
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
17 #include "demuxer.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
18 #include "stheader.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
19 #include "parse_es.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
20 #include "mpeg_hdr.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16505
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
40 static mp_mpeg_header_t picture;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
41
8967
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
42 static int telecine=0;
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
43 static float telecine_cnt=-2.5;
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
44
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
45 typedef enum {
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
46 VIDEO_MPEG12,
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
47 VIDEO_MPEG4,
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
48 VIDEO_H264,
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
49 VIDEO_VC1,
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
50 VIDEO_OTHER
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
51 } video_codec_t;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
52
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
53 static video_codec_t find_video_codec(sh_video_t *sh_video)
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
54 {
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
55 demux_stream_t *d_video=sh_video->ds;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
56 int fmt = d_video->demuxer->file_format;
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
57
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
58 if(
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
59 (fmt == DEMUXER_TYPE_PVA) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
60 (fmt == DEMUXER_TYPE_MPEG_ES) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
61 (fmt == DEMUXER_TYPE_MPEG_GXF) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
62 (fmt == DEMUXER_TYPE_MPEG_PES) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
63 (
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
64 (fmt == DEMUXER_TYPE_MPEG_PS || fmt == DEMUXER_TYPE_MPEG_TS) &&
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
65 ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
66 ) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
67 (fmt == DEMUXER_TYPE_MPEG_TY)
18219
2ea5d88eacd4 Rename some forgotten #ifdef STREAMING_LIVE_DOT_COM to STREAMING_LIVE555.
diego
parents: 17960
diff changeset
68 #ifdef STREAMING_LIVE555
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
69 || ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer))
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
70 #endif
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
71 )
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
72 return VIDEO_MPEG12;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
73 else if((fmt == DEMUXER_TYPE_MPEG4_ES) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
74 ((fmt == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000004)) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
75 ((fmt == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000004))
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
76 )
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
77 return VIDEO_MPEG4;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
78 else if((fmt == DEMUXER_TYPE_H264_ES) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
79 ((fmt == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==0x10000005)) ||
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
80 ((fmt == 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
81 )
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
82 return VIDEO_H264;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
83 else if((fmt == DEMUXER_TYPE_MPEG_PS || fmt == DEMUXER_TYPE_MPEG_TS) &&
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
84 (sh_video->format==mmioFOURCC('W', 'V', 'C', '1')))
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
85 return VIDEO_VC1;
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
86 else
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
87 return VIDEO_OTHER;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
88 }
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
89
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
90 int video_read_properties(sh_video_t *sh_video){
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
91 demux_stream_t *d_video=sh_video->ds;
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
92 video_codec_t video_codec = find_video_codec(sh_video);
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
93 // 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
94 switch(video_codec){
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
95 case VIDEO_OTHER: {
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
96 if((d_video->demuxer->file_format == DEMUXER_TYPE_ASF) || (d_video->demuxer->file_format == DEMUXER_TYPE_AVI)) {
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
97 // display info:
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
98 // in case no strf chunk has been seen in avi, we have no bitmap header
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
99 if(!sh_video->bih) return 0;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
100 sh_video->format=sh_video->bih->biCompression;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
101 sh_video->disp_w=sh_video->bih->biWidth;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
102 sh_video->disp_h=abs(sh_video->bih->biHeight);
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
103 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
104 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
105 }
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
106 case VIDEO_MPEG4: {
14477
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
107 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
108 videobuf_len=0; videobuf_code_len=0;
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
109 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
110 while(1){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
111 int i=sync_video_packet(d_video);
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
112 if(i<=0x11F) break; // found it!
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
113 if(!i || !skip_video_packet(d_video)){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
114 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
115 return 0;
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 }
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
118 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
17226
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
119 if(!videobuffer) {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
120 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
121 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
122 else {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
123 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
124 return 0;
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
125 }
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
126 }
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
127 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Layer Start code... ");
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
128 while(1){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
129 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
130 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
131 if(i>=0x120 && i<=0x12F) break; // found it!
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
132 if(!i || !read_video_packet(d_video)){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
133 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
134 return 0;
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
135 }
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
136 }
14477
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
137 pos = videobuf_len+4;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
138 if(!read_video_packet(d_video)){
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
139 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
140 return 0;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
141 }
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
142 mp4_header_process_vol(&picture, &(videobuffer[pos]));
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
143 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK! FPS SEEMS TO BE %.3f\nSearching for Video Object Plane Start code... ", sh_video->fps);
14477
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
144 mp4_init:
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
145 while(1){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
146 int i=sync_video_packet(d_video);
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
147 if(i==0x1B6) break; // found it!
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
148 if(!i || !read_video_packet(d_video)){
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
149 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
150 return 0;
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
151 }
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
152 }
14477
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
153 pos = videobuf_len+4;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
154 if(!read_video_packet(d_video)){
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
155 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
156 return 0;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
157 }
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
158 mp4_header_process_vop(&picture, &(videobuffer[pos]));
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
159 units[vop_cnt] = picture.timeinc_unit;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
160 vop_cnt++;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
161 //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
162 if(!picture.fps) {
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
163 int i, mn, md, mx, diff;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
164 if(vop_cnt < 3)
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
165 goto mp4_init;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
166
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
167 i=0;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
168 mn = mx = units[0];
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
169 for(i=0; i<3; i++) {
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
170 if(units[i] < mn)
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
171 mn = units[i];
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
172 if(units[i] > mx)
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
173 mx = units[i];
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
174 }
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
175 md = mn;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
176 for(i=0; i<3; i++) {
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
177 if((units[i] > mn) && (units[i] < mx))
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
178 md = units[i];
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 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
181 if(mx - md > md - mn)
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
182 diff = md - mn;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
183 else
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
184 diff = mx - md;
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
185 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
186 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
187 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
188 }
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
189 }
92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents: 14034
diff changeset
190 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
191 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
192 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
193 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
194 }
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
195 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
196 sh_video->format=0x10000004;
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
197 break;
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
198 }
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
199 case VIDEO_H264: {
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
200 int pos = 0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
201 videobuf_len=0; videobuf_code_len=0;
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
202 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence parameter set... ");
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
203 while(1){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
204 int i=sync_video_packet(d_video);
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
205 if((i&~0x60) == 0x107 && i != 0x107) break; // found it!
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
206 if(!i || !skip_video_packet(d_video)){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
207 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
208 return 0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
209 }
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
210 }
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
211 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
17226
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
212 if(!videobuffer) {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
213 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
214 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
215 else {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
216 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
217 return 0;
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
218 }
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
219 }
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
220 pos = videobuf_len+4;
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
221 if(!read_video_packet(d_video)){
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
222 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
223 return 0;
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
224 }
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
225 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos);
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
226 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for picture parameter set... ");
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
227 while(1){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
228 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
229 mp_msg(MSGT_DECVIDEO,MSGL_V,"H264: 0x%X\n",i);
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
230 if((i&~0x60) == 0x108 && i != 0x108) break; // found it!
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
231 if(!i || !read_video_packet(d_video)){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
232 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
233 return 0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
234 }
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
235 }
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
236 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Slice... ");
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
237 while(1){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
238 int i=sync_video_packet(d_video);
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
239 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; // found it!
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
240 if(!i || !read_video_packet(d_video)){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
241 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
242 return 0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
243 }
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
244 }
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
245 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
246 sh_video->format=0x10000005;
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
247 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
248 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
249 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
250 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
251 }
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
252 break;
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
253 }
14034
7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
nicodvb
parents: 12170
diff changeset
254 case VIDEO_MPEG12: {
17277
c568f01ef9f9 search next sequence_header untile a valid one is found
nicodvb
parents: 17226
diff changeset
255 mpeg_header_parser:
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
256 // Find sequence_header first:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
257 videobuf_len=0; videobuf_code_len=0;
8967
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
258 telecine=0; telecine_cnt=-2.5;
24838
a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()
nicodvb
parents: 24837
diff changeset
259 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
260 while(1){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
261 int i=sync_video_packet(d_video);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
262 if(i==0x1B3) break; // found it!
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
263 if(!i || !skip_video_packet(d_video)){
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17343
diff changeset
264 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
265 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr);
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
266 return 0;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
267 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
268 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
269 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
270 // ========= Read & process sequence header & extension ============
17226
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
271 if(!videobuffer) {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
272 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
273 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
274 else {
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
275 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
276 return 0;
255b14c0bc36 malloc padding to avoid access beyond allocated memory
henry
parents: 17012
diff changeset
277 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
278 }
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
279
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
280 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
281 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
282 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
283 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
284 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
285 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
286 goto mpeg_header_parser;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
287 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
288 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
289 int pos=videobuf_len;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
290 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
291 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
292 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
293 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
294 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
295 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
296 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
297 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
298 }
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
299
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
300 // display info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
301 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
302 sh_video->fps=picture.fps;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
303 if(!sh_video->fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
304 sh_video->frametime=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
305 } 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
306 sh_video->frametime=1.0/picture.fps;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
307 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
308 sh_video->disp_w=picture.display_picture_width;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
309 sh_video->disp_h=picture.display_picture_height;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
310 // bitrate:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
311 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ?
9606
0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the
arpi
parents: 9457
diff changeset
312 sh_video->i_bps=picture.bitrate * 400 / 8;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
313 // info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
314 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate);
10709
9ab19ded1b39 printing fps with 3 dec digit instead of 2
arpi
parents: 10687
diff changeset
315 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
316 picture.mpeg1?"MPEG1":"MPEG2",
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
317 sh_video->disp_w,sh_video->disp_h,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
318 picture.aspect_ratio_information,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
319 sh_video->fps,
9606
0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the
arpi
parents: 9457
diff changeset
320 sh_video->i_bps * 8 / 1000.0,
0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the
arpi
parents: 9457
diff changeset
321 sh_video->i_bps / 1000.0 );
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
322 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
323 }
21949
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
324 case VIDEO_VC1: {
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
325 // Find sequence_header:
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
326 videobuf_len=0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
327 videobuf_code_len=0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
328 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
329 while(1){
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
330 int i=sync_video_packet(d_video);
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
331 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
332 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
333 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
334 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
335 return 0;
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 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
338 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
339 if(!videobuffer) {
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
340 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
341 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
342 else {
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
343 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
344 return 0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
345 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
346 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
347 if(!read_video_packet(d_video)){
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
348 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
349 return 0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
350 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
351
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
352 while(1) {
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
353 int i=sync_video_packet(d_video);
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
354 if(i==0x10E) break; // found it!
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
355 if(!i || !skip_video_packet(d_video)){
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
356 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
357 return 0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
358 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
359 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
360 if(!read_video_packet(d_video)){
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
361 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
362 return 0;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
363 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
364
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
365 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
366 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
367 if(sh_video->bih == NULL) {
58d083ace2f2 vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents: 21951
diff changeset
368 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
369 return 0;
58d083ace2f2 vc1 probing code: if sh_video->bih can't be callocated exit
nicodvb
parents: 21951
diff changeset
370 }
21949
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
371 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
372 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
373 sh_video->bih->biCompression = sh_video->format;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
374 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
375 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
376 if(picture.fps > 0) {
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
377 sh_video->frametime=1.0/picture.fps;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
378 sh_video->fps = picture.fps;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
379 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
380 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
381 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
382 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
383 break;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
384 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
385 } // switch(file_format)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
386
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
387 return 1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
388 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
389
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
390 void ty_processuserdata( unsigned char* buf, int len );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
391
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
392 static void process_userdata(unsigned char* buf,int len){
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
393 int i;
6791
a3b2f80f3a26 codmetics :)
arpi
parents: 6784
diff changeset
394 /* if the user data starts with "CC", assume it is a CC info packet */
a3b2f80f3a26 codmetics :)
arpi
parents: 6784
diff changeset
395 if(len>2 && buf[0]=='C' && buf[1]=='C'){
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
396 // mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n");
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
397 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
398 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
399 if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
400 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
401 ty_processuserdata( buf + 2, len - 2 );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
402 return;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 9824
diff changeset
403 }
7208
79fb883d9769 user-data moved one -v up
arpi
parents: 6910
diff changeset
404 if(verbose<2) return;
24839
69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr
nicodvb
parents: 24838
diff changeset
405 fprintf(stderr, "user_data: len=%3d %02X %02X %02X %02X '",
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
406 len, buf[0], buf[1], buf[2], buf[3]);
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
407 for(i=0;i<len;i++)
24839
69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr
nicodvb
parents: 24838
diff changeset
408 // if(buf[i]>=32 && buf[i]<127) fputc(buf[i], stderr);
69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr
nicodvb
parents: 24838
diff changeset
409 if(buf[i]&0x60) fputc(buf[i]&0x7F, stderr);
69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr
nicodvb
parents: 24838
diff changeset
410 fprintf(stderr, "'\n");
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
411 }
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
412
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
413 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
414 demux_stream_t *d_video=sh_video->ds;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
415 demuxer_t *demuxer=d_video->demuxer;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
416 float frame_time=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
417 float pts1=d_video->pts;
8965
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8027
diff changeset
418 float pts=0;
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8027
diff changeset
419 int picture_coding_type=0;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
420 int in_size=0;
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
421 video_codec_t video_codec = find_video_codec(sh_video);
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
422
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
423 *start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
424
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
425 if(video_codec == VIDEO_MPEG12){
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
426 int in_frame=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
427 //float newfps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
428 //videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
429 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
430 int i=sync_video_packet(d_video);
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
431 //void* buffer=&videobuffer[videobuf_len+4];
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
432 int start=videobuf_len+4;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
433 if(in_frame){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
434 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
435 if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
436 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
437 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
438 } else {
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
439 if(i==0x100){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
440 pts=d_video->pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
441 d_video->pts=0;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
442 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
443 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
444 else if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
445 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
446 if(!read_video_packet(d_video)) return -1; // EOF
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
447 // process headers:
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
448 switch(i){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
449 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
450 case 0x1B5: mp_header_process_extension (&picture, &videobuffer[start]);break;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
451 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
452 case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
453 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
454 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
455
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
456 *start=videobuffer; in_size=videobuf_len;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
457
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
458 // 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
459 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
460 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
461 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
462 sh_video->frametime=1.0/picture.fps;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
463 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
464
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
465 // fix mpeg2 frametime:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
466 frame_time=(picture.display_time)*0.01f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
467 picture.display_time=100;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
468 videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
469
8967
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
470 telecine_cnt*=0.9; // drift out error
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
471 telecine_cnt+=frame_time-5.0/4.0;
9221
arpi
parents: 9129
diff changeset
472 mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"\r telecine = %3.1f %5.3f \n",frame_time,telecine_cnt);
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
473
8967
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
474 if(telecine){
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
475 frame_time=1;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
476 if(telecine_cnt<-1.5 || telecine_cnt>1.5){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
477 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_LeaveTelecineMode);
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
478 telecine=0;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
479 }
8967
95f0a0d006c5 telecine detection
arpi
parents: 8965
diff changeset
480 } else
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
481 if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
482 sh_video->fps=sh_video->fps*4/5;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
483 sh_video->frametime=sh_video->frametime*5/4;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
484 mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode);
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
485 telecine=1;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
486 }
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
487 } else if(video_codec == VIDEO_MPEG4){
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
488 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
489 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
490 if(!i) return -1;
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
491 if(!read_video_packet(d_video)) return -1; // EOF
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
492 if(i==0x1B6) break;
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 8967
diff changeset
493 }
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
494 *start=videobuffer; in_size=videobuf_len;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
495 videobuf_len=0;
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
496 } else if(video_codec == VIDEO_H264){
16505
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
497 int in_picture = 0;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
498 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
499 int i=sync_video_packet(d_video);
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
500 int pos = videobuf_len+4;
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
501 if(!i) return -1;
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
502 if(!read_video_packet(d_video)) return -1; // EOF
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
503 if((i&~0x60) == 0x107 && i != 0x107) {
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
504 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos);
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
505 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
506 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
507 sh_video->frametime=1.0/picture.fps;
14798
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
508 }
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
509 i=sync_video_packet(d_video);
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
510 if(!i) return -1;
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
511 if(!read_video_packet(d_video)) return -1; // EOF
0bd50330e688 framerate autodetection for H264 in raw/ts streams
nicodvb
parents: 14477
diff changeset
512 }
16505
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
513
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
514 // here starts the access unit end detection code
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
515 // 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
516 // 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
517 // 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
518 // Message-ID: <20050917092406.GA7699@rz.uni-karlsruhe.de>
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
519 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
520 // 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
521 // picture, so start scanning for the end now
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
522 in_picture = 1;
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
523 if (in_picture) {
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
524 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
525 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
526 if(i == 0x101 || i == 0x102 || i == 0x105) {
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
527 // assuming arbitrary slice ordering is not allowed, the
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
528 // 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
529 // for the first VCL NAL in a picture
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
530 if (demux_peekc(d_video) & 0x80)
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
531 break;
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
532 }
cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.
reimar
parents: 16314
diff changeset
533 }
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9693
diff changeset
534 }
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
535 *start=videobuffer; in_size=videobuf_len;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
536 videobuf_len=0;
24832
e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
nicodvb
parents: 23752
diff changeset
537 } else if(video_codec == VIDEO_VC1) {
21949
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
538 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
539 int i=sync_video_packet(d_video);
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
540 if(!i) return -1;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
541 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
542 if(i==0x10D) break;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
543 }
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
544 *start=videobuffer;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
545 in_size=videobuf_len;
202327a68635 decode vc1 sequence header and frame it in video_read_frame();
nicodvb
parents: 21809
diff changeset
546 videobuf_len=0;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
547 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
548 // frame-based file formats: (AVI,ASF,MOV)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
549 in_size=ds_get_packet(d_video,start);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
550 if(in_size<0) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
551 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
552
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
553
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
554 //------------------------ frame decoded. --------------------
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
555
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
556 // Increase video timers:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
557 sh_video->num_frames+=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
558 ++sh_video->num_frames_decoded;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
559
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
560 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
561
b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents: 5572
diff changeset
562 // 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
563 if(!force_fps) switch(demuxer->file_format){
9693
1d598bf65571 10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents: 9610
diff changeset
564 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
565 case DEMUXER_TYPE_MATROSKA:
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
566 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1)
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
567 frame_time=d_video->pts-pts1;
6423
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
568 break;
5573
b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents: 5572
diff changeset
569 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
570 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
571 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
572 case DEMUXER_TYPE_VIVO:
19802
f1655de446c4 Support for variable fps OGM files, blessed by Moritz.
diego
parents: 19695
diff changeset
573 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
574 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
575 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
576 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
577 if(d>=0){
6423
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
578 if(d>0){
19082
a2f20562aac3 Remove support for obsolete and non-free divx4/odivx libraries.
diego
parents: 18942
diff changeset
579 if((int)sh_video->fps==1000)
6423
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
580 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d));
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
581 sh_video->frametime=d; // 1ms
6423
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
582 sh_video->fps=1.0f/d;
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
583 }
5930
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5898
diff changeset
584 frame_time = d;
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5898
diff changeset
585 } else {
6423
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
586 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);
13cf65db9ebc fixed playback speed and a-v sync issues
arpi
parents: 6371
diff changeset
587 // frame_time = 1/25.0;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
588 }
5573
b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents: 5572
diff changeset
589 }
9693
1d598bf65571 10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
alex
parents: 9610
diff changeset
590 break;
12170
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
591 case DEMUXER_TYPE_LAVF:
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
592 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
593 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
594 double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;
12170
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
595 if(d>=0){
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
596 frame_time = d;
24837
fdd2cf92f854 removed more empty spaces and empty lines
nicodvb
parents: 24836
diff changeset
597 }
12170
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
598 }
8db1b587d16a lavf ASF support
michael
parents: 11833
diff changeset
599 break;
18942
cf05a9897d1b Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents: 18873
diff changeset
600 case DEMUXER_TYPE_REAL:
cf05a9897d1b Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents: 18873
diff changeset
601 {
19695
782364fc00c4 Use better resolution for pts computation.
rtogni
parents: 19655
diff changeset
602 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
603 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
604
19655
bddd0b58efb6 Workaround for live Real streams starting with nonzero pts
rtogni
parents: 19082
diff changeset
605 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
606 }
cf05a9897d1b Revert r18878, always sync rm files using only pts (ignore framerate)
rtogni
parents: 18873
diff changeset
607 break;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
608 }
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
609
24836
4e90fdb819b0 replaced giant if() with if(pre-calculated variable) (there was even a bug: PS doesn't necessarily contain mpeg12)
nicodvb
parents: 24834
diff changeset
610 if(video_codec == VIDEO_MPEG12){
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
611 sh_video->pts+=frame_time;
24912
384aa7179c9c in video_read_frame() set the keyframe flag in demuxer->video when dealing with
nicodvb
parents: 24850
diff changeset
612 if(picture_coding_type==1)
384aa7179c9c in video_read_frame() set the keyframe flag in demuxer->video when dealing with
nicodvb
parents: 24850
diff changeset
613 d_video->flags |= 1;
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
614 if(picture_coding_type<=2 && sh_video->i_pts){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
615 sh_video->pts=sh_video->i_pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
616 sh_video->i_pts=pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
617 } else {
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
618 if(pts){
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
619 if(picture_coding_type<=2) sh_video->i_pts=pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
620 else sh_video->pts=pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
621 }
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
622 }
8965
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8027
diff changeset
623 } else
24834
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
624 sh_video->pts=d_video->pts;
a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
nicodvb
parents: 24832
diff changeset
625
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
626 if(frame_time_ptr) *frame_time_ptr=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
627 return in_size;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
628 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
629