mplayer.hg: libmpdemux/video.c annotate

1 /*

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

2 * video frame reading

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

3 *

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

4 * This file is part of MPlayer.

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

5 *

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

6 * MPlayer is free software; you can redistribute it and/or modify

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

7 * it under the terms of the GNU General Public License as published by

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

8 * the Free Software Foundation; either version 2 of the License, or

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

9 * (at your option) any later version.

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

10 *

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

11 * MPlayer is distributed in the hope that it will be useful,

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

12 * but WITHOUT ANY WARRANTY; without even the implied warranty of

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

14 * GNU General Public License for more details.

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

15 *

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

16 * You should have received a copy of the GNU General Public License along

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

17 * with MPlayer; if not, write to the Free Software Foundation, Inc.,

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

d643e4643313 Add standard license header to all files in libmpdemux.

diego

parents: 28594

19 */

ea6158be8103 video frame reading cleanup

arpi

parents:

20

2775

8e3875816f6d added missing #include <malloc.h>

pl

parents: 2567

21 #include "config.h"

8e3875816f6d added missing #include <malloc.h>

pl

parents: 2567

22

ea6158be8103 video frame reading cleanup

arpi

parents:

23 #include <stdio.h>

28594

df67d03dde3b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:

diego

parents: 28018

24 #if HAVE_MALLOC_H

2775

8e3875816f6d added missing #include <malloc.h>

pl

parents: 2567

25 #include <malloc.h>

8e3875816f6d added missing #include <malloc.h>

pl

parents: 2567

26 #endif

ea6158be8103 video frame reading cleanup

arpi

parents:

27 #include <stdlib.h>

3726

1acf2f1f9dc8 missing #include's

pl

parents: 3666

28 #include <string.h>

ea6158be8103 video frame reading cleanup

arpi

parents:

29 #include <unistd.h>

ea6158be8103 video frame reading cleanup

arpi

parents:

30

ea6158be8103 video frame reading cleanup

arpi

parents:

31 #include "mp_msg.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

32 #include "help_mp.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

33

22605

4d81dbdf46b9 Add explicit location for headers from the stream/ directory.

diego

parents: 22173

34 #include "stream/stream.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

35 #include "demuxer.h"

30577

737b7fd47ef4 Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations.

diego

parents: 29878

36 #include "demux_ty_osd.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

37 #include "stheader.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

38 #include "parse_es.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

39 #include "mpeg_hdr.h"

ea6158be8103 video frame reading cleanup

arpi

parents:

40

6784

b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.

atmos4

parents: 6571

41 /* sub_cc (closed captions)*/

17012

6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.

diego

parents: 16505

42 #include "sub_cc.h"

6784

b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.

atmos4

parents: 6571

43

4774

fc2f76964606 Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen

atmos4

parents: 4705

44 /* biCompression constant */

fc2f76964606 Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen

atmos4

parents: 4705

45 #define BI_RGB 0L

fc2f76964606 Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen

atmos4

parents: 4705

46

27397

d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and

diego

parents: 27282

47 #ifdef CONFIG_LIVE555

9457

ea1c0a4520bf Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>

bertrand

parents: 9221

48 #include "demux_rtp.h"

ea1c0a4520bf Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>

bertrand

parents: 9221

49 #endif

ea1c0a4520bf Repairing breakage to RTP streaming. Patch by Ross Finlayson <finlayson@live.com>

bertrand

parents: 9221

50

ea6158be8103 video frame reading cleanup

arpi

parents:

51 static mp_mpeg_header_t picture;

ea6158be8103 video frame reading cleanup

arpi

parents:

52

95f0a0d006c5 telecine detection

arpi

parents: 8965

53 static int telecine=0;

95f0a0d006c5 telecine detection

arpi

parents: 8965

54 static float telecine_cnt=-2.5;

95f0a0d006c5 telecine detection

arpi

parents: 8965

55

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

56 typedef enum {

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

57 VIDEO_MPEG12,

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

58 VIDEO_MPEG4,

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

59 VIDEO_H264,

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

60 VIDEO_VC1,

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

61 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

62 } 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

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

64 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

65 {

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

66 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

67 int fmt = d_video->demuxer->file_format;

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

68

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

69 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

70 (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

71 (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

72 (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

73 (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

74 (

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

75 (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

76 ((! 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

77 ) ||

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

78 (fmt == DEMUXER_TYPE_MPEG_TY)

27397

d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and

diego

parents: 27282

79 #ifdef CONFIG_LIVE555

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

80 || ((fmt == 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

81 #endif

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

82 )

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

83 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

84 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

85 ((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

86 ((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

87 )

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

88 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

89 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

90 ((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

91 ((fmt == DEMUXER_TYPE_MPEG_PS) && (sh_video->format==0x10000005))

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

92 )

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

93 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

94 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

95 (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

96 return VIDEO_VC1;

26296

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

97 else if (fmt == DEMUXER_TYPE_ASF && sh_video->bih && sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' '))

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

98 return VIDEO_MPEG12;

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

99 else

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

100 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

101 }

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

102

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

103 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

104 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

105 video_codec_t video_codec = find_video_codec(sh_video);

ea6158be8103 video frame reading cleanup

arpi

parents:

106 // Determine image properties:

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

107 switch(video_codec){

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

108 case VIDEO_OTHER: {

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

109 if((d_video->demuxer->file_format == DEMUXER_TYPE_ASF) || (d_video->demuxer->file_format == DEMUXER_TYPE_AVI)) {

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

110 // display info:

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

111 // 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

112 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

113 sh_video->format=sh_video->bih->biCompression;

ea6158be8103 video frame reading cleanup

arpi

parents:

114 sh_video->disp_w=sh_video->bih->biWidth;

ea6158be8103 video frame reading cleanup

arpi

parents:

115 sh_video->disp_h=abs(sh_video->bih->biHeight);

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

116 }

ea6158be8103 video frame reading cleanup

arpi

parents:

117 break;

ea6158be8103 video frame reading cleanup

arpi

parents:

118 }

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

119 case VIDEO_MPEG4: {

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

120 int pos = 0, vop_cnt=0, units[3];

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

121 videobuf_len=0; videobuf_code_len=0;

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

122 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

123 while(1){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

124 int i=sync_video_packet(d_video);

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

125 if(i<=0x11F) break; // found it!

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

126 if(!i || !skip_video_packet(d_video)){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

127 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

128 return 0;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

129 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

130 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

131 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

132 if(!videobuffer) {

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

133 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

134 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

135 else {

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

136 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

137 return 0;

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

138 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

139 }

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

140 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Layer Start code... ");

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

141 while(1){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

142 int i=sync_video_packet(d_video);

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

143 mp_msg(MSGT_DECVIDEO,MSGL_V,"M4V: 0x%X\n",i);

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

144 if(i>=0x120 && i<=0x12F) break; // found it!

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

145 if(!i || !read_video_packet(d_video)){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

146 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

147 return 0;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

148 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

149 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

150 pos = videobuf_len+4;

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

151 if(!read_video_packet(d_video)){

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

152 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

153 return 0;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

154 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

155 mp4_header_process_vol(&picture, &(videobuffer[pos]));

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

156 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK! FPS SEEMS TO BE %.3f\nSearching for Video Object Plane Start code... ", sh_video->fps);

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

157 mp4_init:

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

158 while(1){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

159 int i=sync_video_packet(d_video);

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

160 if(i==0x1B6) break; // found it!

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

161 if(!i || !read_video_packet(d_video)){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

162 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

163 return 0;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

164 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

165 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

166 pos = videobuf_len+4;

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

167 if(!read_video_packet(d_video)){

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

168 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

169 return 0;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

170 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

171 mp4_header_process_vop(&picture, &(videobuffer[pos]));

30862

2a8e5cea0c8c Calculate width and height in mp4_header_process_vop().

cehoyos

parents: 30702

172 sh_video->disp_w = picture.display_picture_width;

2a8e5cea0c8c Calculate width and height in mp4_header_process_vop().

cehoyos

parents: 30702

173 sh_video->disp_h = picture.display_picture_height;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

174 units[vop_cnt] = picture.timeinc_unit;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

175 vop_cnt++;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

176 //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

177 if(!picture.fps) {

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

178 int i, mn, md, mx, diff;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

179 if(vop_cnt < 3)

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

180 goto mp4_init;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

181

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

182 i=0;

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

183 mn = mx = units[0];

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

184 for(i=0; i<3; i++) {

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

185 if(units[i] < mn)

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

186 mn = units[i];

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

187 if(units[i] > mx)

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

188 mx = units[i];

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

189 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

190 md = mn;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

191 for(i=0; i<3; i++) {

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

192 if((units[i] > mn) && (units[i] < mx))

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

193 md = units[i];

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

194 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

195 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

196 if(mx - md > md - mn)

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

197 diff = md - mn;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

198 else

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

199 diff = mx - md;

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

200 if(diff > 0){

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

201 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

202 mp_msg(MSGT_DECVIDEO,MSGL_V, "FPS seems to be: %f, resolution: %d, delta_units: %d\n", picture.fps, picture.timeinc_resolution, diff);

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

203 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

204 }

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

205 if(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

206 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

207 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

208 mp_msg(MSGT_DECVIDEO,MSGL_INFO, "FPS seems to be: %f\n", picture.fps);

92553e3c8f01 automatic fps calculation for mpeg4 in raw stream/mpeg-ts

nicodvb

parents: 14034

209 }

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

210 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

211 sh_video->format=0x10000004;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

212 break;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

213 }

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

214 case VIDEO_H264: {

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

215 int pos = 0;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

216 videobuf_len=0; videobuf_code_len=0;

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

217 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence parameter set... ");

39b68c2664ec H264-ES demuxer

michael

parents: 9693

218 while(1){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

219 int i=sync_video_packet(d_video);

39b68c2664ec H264-ES demuxer

michael

parents: 9693

220 if((i&~0x60) == 0x107 && i != 0x107) break; // found it!

39b68c2664ec H264-ES demuxer

michael

parents: 9693

221 if(!i || !skip_video_packet(d_video)){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

222 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

223 return 0;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

224 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

225 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

226 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

227 if(!videobuffer) {

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

228 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

229 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

230 else {

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

231 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

232 return 0;

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

233 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

234 }

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

235 pos = videobuf_len+4;

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

236 if(!read_video_packet(d_video)){

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

237 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

238 return 0;

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

239 }

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

240 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos);

29878

2b4de9979153 Set display size in sh_video when decoding H264.

cehoyos

parents: 29263

241 sh_video->disp_w=picture.display_picture_width;

2b4de9979153 Set display size in sh_video when decoding H264.

cehoyos

parents: 29263

242 sh_video->disp_h=picture.display_picture_height;

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

243 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for picture parameter set... ");

39b68c2664ec H264-ES demuxer

michael

parents: 9693

244 while(1){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

245 int i=sync_video_packet(d_video);

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

246 mp_msg(MSGT_DECVIDEO,MSGL_V,"H264: 0x%X\n",i);

39b68c2664ec H264-ES demuxer

michael

parents: 9693

247 if((i&~0x60) == 0x108 && i != 0x108) break; // found it!

39b68c2664ec H264-ES demuxer

michael

parents: 9693

248 if(!i || !read_video_packet(d_video)){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

249 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

250 return 0;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

251 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

252 }

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

253 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Slice... ");

39b68c2664ec H264-ES demuxer

michael

parents: 9693

254 while(1){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

255 int i=sync_video_packet(d_video);

39b68c2664ec H264-ES demuxer

michael

parents: 9693

256 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) break; // found it!

39b68c2664ec H264-ES demuxer

michael

parents: 9693

257 if(!i || !read_video_packet(d_video)){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

258 mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

259 return 0;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

260 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

261 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

262 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");

39b68c2664ec H264-ES demuxer

michael

parents: 9693

263 sh_video->format=0x10000005;

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

264 if(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

265 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

266 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

267 mp_msg(MSGT_DECVIDEO,MSGL_INFO, "FPS seems to be: %f\n", picture.fps);

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

268 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

269 break;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

270 }

7ac60a1c576e merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS

nicodvb

parents: 12170

271 case VIDEO_MPEG12: {

26296

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

272 if (d_video->demuxer->file_format == DEMUXER_TYPE_ASF) { // DVR-MS

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

273 if(!sh_video->bih) return 0;

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

274 sh_video->format=sh_video->bih->biCompression;

71ddd37be152 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder

reimar

parents: 26069

275 }

17277

c568f01ef9f9 search next sequence_header untile a valid one is found

nicodvb

parents: 17226

276 mpeg_header_parser:

ea6158be8103 video frame reading cleanup

arpi

parents:

277 // Find sequence_header first:

ea6158be8103 video frame reading cleanup

arpi

parents:

278 videobuf_len=0; videobuf_code_len=0;

95f0a0d006c5 telecine detection

arpi

parents: 8965

279 telecine=0; telecine_cnt=-2.5;

a0181b13daf5 removed funny calls to fflush(stdout) after mp_msg()

nicodvb

parents: 24837

280 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");

ea6158be8103 video frame reading cleanup

arpi

parents:

281 while(1){

ea6158be8103 video frame reading cleanup

arpi

parents:

282 int i=sync_video_packet(d_video);

ea6158be8103 video frame reading cleanup

arpi

parents:

283 if(i==0x1B3) break; // found it!

ea6158be8103 video frame reading cleanup

arpi

parents:

284 if(!i || !skip_video_packet(d_video)){

17932

3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.

diego

parents: 17343

285 if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");

ea6158be8103 video frame reading cleanup

arpi

parents:

286 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr);

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

287 return 0;

ea6158be8103 video frame reading cleanup

arpi

parents:

288 }

ea6158be8103 video frame reading cleanup

arpi

parents:

289 }

ea6158be8103 video frame reading cleanup

arpi

parents:

290 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");

ea6158be8103 video frame reading cleanup

arpi

parents:

291 // ========= Read & process sequence header & extension ============

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

292 if(!videobuffer) {

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

293 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

294 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

295 else {

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

296 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

297 return 0;

255b14c0bc36 malloc padding to avoid access beyond allocated memory

henry

parents: 17012

298 }

ea6158be8103 video frame reading cleanup

arpi

parents:

299 }

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

300

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

301 if(!read_video_packet(d_video)){

ea6158be8103 video frame reading cleanup

arpi

parents:

302 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr);

ea6158be8103 video frame reading cleanup

arpi

parents:

303 return 0;

ea6158be8103 video frame reading cleanup

arpi

parents:

304 }

ea6158be8103 video frame reading cleanup

arpi

parents:

305 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) {

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

306 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr);

17277

c568f01ef9f9 search next sequence_header untile a valid one is found

nicodvb

parents: 17226

307 goto mpeg_header_parser;

ea6158be8103 video frame reading cleanup

arpi

parents:

308 }

ea6158be8103 video frame reading cleanup

arpi

parents:

309 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.

ea6158be8103 video frame reading cleanup

arpi

parents:

310 int pos=videobuf_len;

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

311 if(!read_video_packet(d_video)){

ea6158be8103 video frame reading cleanup

arpi

parents:

312 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx);

ea6158be8103 video frame reading cleanup

arpi

parents:

313 return 0;

ea6158be8103 video frame reading cleanup

arpi

parents:

314 }

ea6158be8103 video frame reading cleanup

arpi

parents:

315 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) {

ea6158be8103 video frame reading cleanup

arpi

parents:

316 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx);

ea6158be8103 video frame reading cleanup

arpi

parents:

317 return 0;

ea6158be8103 video frame reading cleanup

arpi

parents:

318 }

ea6158be8103 video frame reading cleanup

arpi

parents:

319 }

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

320

ea6158be8103 video frame reading cleanup

arpi

parents:

321 // display info:

ea6158be8103 video frame reading cleanup

arpi

parents:

322 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video

30641

b14b32c20935 Fix fps output with -identify when frame rate extension is used for MPEG-2

reimar

parents: 30639

323 sh_video->fps=picture.fps * picture.frame_rate_extension_n / picture.frame_rate_extension_d;

ea6158be8103 video frame reading cleanup

arpi

parents:

324 if(!sh_video->fps){

ea6158be8103 video frame reading cleanup

arpi

parents:

325 sh_video->frametime=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

326 } else {

30924

798e4a2b2571 100l, fix frametime calculation for MPEG-2 files with frame rate extension.

reimar

parents: 30862

327 sh_video->frametime=1.0/sh_video->fps;

ea6158be8103 video frame reading cleanup

arpi

parents:

328 }

ea6158be8103 video frame reading cleanup

arpi

parents:

329 sh_video->disp_w=picture.display_picture_width;

ea6158be8103 video frame reading cleanup

arpi

parents:

330 sh_video->disp_h=picture.display_picture_height;

ea6158be8103 video frame reading cleanup

arpi

parents:

331 // bitrate:

ea6158be8103 video frame reading cleanup

arpi

parents:

332 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ?

9606

0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the

arpi

parents: 9457

333 sh_video->i_bps=picture.bitrate * 400 / 8;

ea6158be8103 video frame reading cleanup

arpi

parents:

334 // info:

ea6158be8103 video frame reading cleanup

arpi

parents:

335 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

336 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",

ea6158be8103 video frame reading cleanup

arpi

parents:

337 picture.mpeg1?"MPEG1":"MPEG2",

ea6158be8103 video frame reading cleanup

arpi

parents:

338 sh_video->disp_w,sh_video->disp_h,

ea6158be8103 video frame reading cleanup

arpi

parents:

339 picture.aspect_ratio_information,

ea6158be8103 video frame reading cleanup

arpi

parents:

340 sh_video->fps,

9606

0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the

arpi

parents: 9457

341 sh_video->i_bps * 8 / 1000.0,

0197c1e933fe This patch corrects the calculation of the MPEG bitrate from the

arpi

parents: 9457

342 sh_video->i_bps / 1000.0 );

ea6158be8103 video frame reading cleanup

arpi

parents:

343 break;

ea6158be8103 video frame reading cleanup

arpi

parents:

344 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

345 case VIDEO_VC1: {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

346 // Find sequence_header:

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

347 videobuf_len=0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

348 videobuf_code_len=0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

349 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

350 while(1){

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

351 int i=sync_video_packet(d_video);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

352 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

353 if(!i || !skip_video_packet(d_video)){

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

354 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

355 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

356 return 0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

357 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

358 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

359 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"found\n");

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

360 if(!videobuffer) {

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

361 videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE);

16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get

reimar

parents: 27269

362 if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

363 else {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

364 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

365 return 0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

366 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

367 }

0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.

diego

parents: 29238

368 if(!read_video_packet(d_video)){

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

369 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

370 return 0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

371 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

372

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

373 while(1) {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

374 int i=sync_video_packet(d_video);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

375 if(i==0x10E) break; // found it!

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

376 if(!i || !skip_video_packet(d_video)){

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

377 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

378 return 0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

379 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

380 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

381 if(!read_video_packet(d_video)){

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

382 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

383 return 0;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

384 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

385

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

386 if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) {

32105

c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).

reimar

parents: 30924

387 sh_video->bih = calloc(1, sizeof(*sh_video->bih) + videobuf_len);

21952

58d083ace2f2 vc1 probing code: if sh_video->bih can't be callocated exit

nicodvb

parents: 21951

388 if(sh_video->bih == NULL) {

32105

c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).

reimar

parents: 30924

389 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(*sh_video->bih) + videobuf_len);

21952

58d083ace2f2 vc1 probing code: if sh_video->bih can't be callocated exit

nicodvb

parents: 21951

390 return 0;

58d083ace2f2 vc1 probing code: if sh_video->bih can't be callocated exit

nicodvb

parents: 21951

391 }

32105

c08363dc5320 Replace sizoef(type) by sizeof(*ptrvar).

reimar

parents: 30924

392 sh_video->bih->biSize= sizeof(*sh_video->bih) + videobuf_len;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

393 memcpy(sh_video->bih + 1, videobuffer, videobuf_len);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

394 sh_video->bih->biCompression = sh_video->format;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

395 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

396 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

397 if(picture.fps > 0) {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

398 sh_video->frametime=1.0/picture.fps;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

399 sh_video->fps = picture.fps;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

400 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

401 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

402 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

403 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

404 break;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

405 }

ea6158be8103 video frame reading cleanup

arpi

parents:

406 } // switch(file_format)

ea6158be8103 video frame reading cleanup

arpi

parents:

407

ea6158be8103 video frame reading cleanup

arpi

parents:

408 return 1;

ea6158be8103 video frame reading cleanup

arpi

parents:

409 }

ea6158be8103 video frame reading cleanup

arpi

parents:

410

4074

aca490499e1f added mpeg userdata dump

arpi

parents: 3980

411 static void process_userdata(unsigned char* buf,int len){

aca490499e1f added mpeg userdata dump

arpi

parents: 3980

412 int i;

6791

a3b2f80f3a26 codmetics :)

arpi

parents: 6784

413 /* if the user data starts with "CC", assume it is a CC info packet */

a3b2f80f3a26 codmetics :)

arpi

parents: 6784

414 if(len>2 && buf[0]=='C' && buf[1]=='C'){

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

415 // 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

416 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

417 }

10263

0df8816f4665 TiVo demuxer and sub-cc/osd decoder

arpi

parents: 9824

418 if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' )

0df8816f4665 TiVo demuxer and sub-cc/osd decoder

arpi

parents: 9824

419 {

0df8816f4665 TiVo demuxer and sub-cc/osd decoder

arpi

parents: 9824

420 ty_processuserdata( buf + 2, len - 2 );

0df8816f4665 TiVo demuxer and sub-cc/osd decoder

arpi

parents: 9824

421 return;

0df8816f4665 TiVo demuxer and sub-cc/osd decoder

arpi

parents: 9824

422 }

7208

79fb883d9769 user-data moved one -v up

arpi

parents: 6910

423 if(verbose<2) return;

24839

69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr

nicodvb

parents: 24838

424 fprintf(stderr, "user_data: len=%3d %02X %02X %02X %02X '",

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

425 len, buf[0], buf[1], buf[2], buf[3]);

4074

aca490499e1f added mpeg userdata dump

arpi

parents: 3980

426 for(i=0;i<len;i++)

24839

69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr

nicodvb

parents: 24838

427 // 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

428 if(buf[i]&0x60) fputc(buf[i]&0x7F, stderr);

69f5bb02b659 in process_userdata() move debugging messages from stdout to stderr

nicodvb

parents: 24838

429 fprintf(stderr, "'\n");

4074

aca490499e1f added mpeg userdata dump

arpi

parents: 3980

430 }

aca490499e1f added mpeg userdata dump

arpi

parents: 3980

431

ea6158be8103 video frame reading cleanup

arpi

parents:

432 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:

433 demux_stream_t *d_video=sh_video->ds;

ea6158be8103 video frame reading cleanup

arpi

parents:

434 demuxer_t *demuxer=d_video->demuxer;

ea6158be8103 video frame reading cleanup

arpi

parents:

435 float frame_time=1;

ea6158be8103 video frame reading cleanup

arpi

parents:

436 float pts1=d_video->pts;

8965

14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)

arpi

parents: 8027

437 float pts=0;

30639

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

438 float fps;

8965

14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)

arpi

parents: 8027

439 int picture_coding_type=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

440 int in_size=0;

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

441 video_codec_t video_codec = find_video_codec(sh_video);

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

442

ea6158be8103 video frame reading cleanup

arpi

parents:

443 *start=NULL;

ea6158be8103 video frame reading cleanup

arpi

parents:

444

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

445 if(video_codec == VIDEO_MPEG12){

ea6158be8103 video frame reading cleanup

arpi

parents:

446 int in_frame=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

447 //float newfps;

ea6158be8103 video frame reading cleanup

arpi

parents:

448 //videobuf_len=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

449 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){

ea6158be8103 video frame reading cleanup

arpi

parents:

450 int i=sync_video_packet(d_video);

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

451 //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

452 int start=videobuf_len+4;

ea6158be8103 video frame reading cleanup

arpi

parents:

453 if(in_frame){

ea6158be8103 video frame reading cleanup

arpi

parents:

454 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame

ea6158be8103 video frame reading cleanup

arpi

parents:

455 if(!i) return -1; // EOF

ea6158be8103 video frame reading cleanup

arpi

parents:

456 break;

ea6158be8103 video frame reading cleanup

arpi

parents:

457 }

ea6158be8103 video frame reading cleanup

arpi

parents:

458 } else {

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

459 if(i==0x100){

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

460 pts=d_video->pts;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

461 d_video->pts=0;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

462 }

ea6158be8103 video frame reading cleanup

arpi

parents:

463 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode

ea6158be8103 video frame reading cleanup

arpi

parents:

464 else if(!i) return -1; // EOF

ea6158be8103 video frame reading cleanup

arpi

parents:

465 }

ea6158be8103 video frame reading cleanup

arpi

parents:

466 if(!read_video_packet(d_video)) return -1; // EOF

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

467 // process headers:

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

468 switch(i){

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

469 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

470 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

471 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

472 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

473 }

ea6158be8103 video frame reading cleanup

arpi

parents:

474 }

30639

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

475 fps = picture.fps * picture.frame_rate_extension_n / picture.frame_rate_extension_d;

ea6158be8103 video frame reading cleanup

arpi

parents:

476

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

477 *start=videobuffer; in_size=videobuf_len;

ea6158be8103 video frame reading cleanup

arpi

parents:

478

ea6158be8103 video frame reading cleanup

arpi

parents:

479 // get mpeg fps:

30639

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

480 if(sh_video->fps!=fps) if(!force_fps && !telecine){

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

481 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,fps,sh_video->fps-fps,picture.frame_rate_code);

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

482 sh_video->fps=fps;

102ae81b5dc8 Parse and use the information from the frame rate extension header for MPEG-2.

reimar

parents: 30633

483 sh_video->frametime=1.0/fps;

ea6158be8103 video frame reading cleanup

arpi

parents:

484 }

ea6158be8103 video frame reading cleanup

arpi

parents:

485

ea6158be8103 video frame reading cleanup

arpi

parents:

486 // fix mpeg2 frametime:

ea6158be8103 video frame reading cleanup

arpi

parents:

487 frame_time=(picture.display_time)*0.01f;

ea6158be8103 video frame reading cleanup

arpi

parents:

488 picture.display_time=100;

ea6158be8103 video frame reading cleanup

arpi

parents:

489 videobuf_len=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

490

95f0a0d006c5 telecine detection

arpi

parents: 8965

491 telecine_cnt*=0.9; // drift out error

95f0a0d006c5 telecine detection

arpi

parents: 8965

492 telecine_cnt+=frame_time-5.0/4.0;

9221

e9707479087c debug

arpi

parents: 9129

493 mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"\r telecine = %3.1f %5.3f \n",frame_time,telecine_cnt);

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

494

95f0a0d006c5 telecine detection

arpi

parents: 8965

495 if(telecine){

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

496 frame_time=1;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

497 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

498 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

499 telecine=0;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

500 }

95f0a0d006c5 telecine detection

arpi

parents: 8965

501 } else

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

502 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

503 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

504 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

505 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

506 telecine=1;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

507 }

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

508 } else if(video_codec == VIDEO_MPEG4){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

509 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

510 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

511 if(!i) return -1;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

512 if(!read_video_packet(d_video)) return -1; // EOF

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

513 if(i==0x1B6) break;

0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)

arpi

parents: 8967

514 }

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

515 *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

516 videobuf_len=0;

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

517 } else if(video_codec == VIDEO_H264){

16505

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

518 int in_picture = 0;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

519 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){

39b68c2664ec H264-ES demuxer

michael

parents: 9693

520 int i=sync_video_packet(d_video);

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

521 int pos = videobuf_len+4;

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

522 if(!i) return -1;

39b68c2664ec H264-ES demuxer

michael

parents: 9693

523 if(!read_video_packet(d_video)) return -1; // EOF

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

524 if((i&~0x60) == 0x107 && i != 0x107) {

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

525 h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos);

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

526 if(picture.fps > 0) {

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

527 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

528 sh_video->frametime=1.0/picture.fps;

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

529 }

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

530 i=sync_video_packet(d_video);

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

531 if(!i) return -1;

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

532 if(!read_video_packet(d_video)) return -1; // EOF

0bd50330e688 framerate autodetection for H264 in raw/ts streams

nicodvb

parents: 14477

533 }

16505

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

534

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

535 // here starts the access unit end detection code

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

536 // see the mail on MPlayer-dev-eng for details:

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

537 // Date: Sat, 17 Sep 2005 11:24:06 +0200

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

538 // Subject: Re: [MPlayer-dev-eng] [RFC] h264 ES parser problems

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

539 // Message-ID: <20050917092406.GA7699@rz.uni-karlsruhe.de>

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

540 if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105)

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

541 // 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

542 // picture, so start scanning for the end now

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

543 in_picture = 1;

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

544 if (in_picture) {

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

545 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

546 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

547 if(i == 0x101 || i == 0x102 || i == 0x105) {

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

548 // assuming arbitrary slice ordering is not allowed, the

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

549 // 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

550 // for the first VCL NAL in a picture

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

551 if (demux_peekc(d_video) & 0x80)

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

552 break;

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

553 }

cb6599e433d7 Fix H264 packetizer. Might not work with arbitrary slice order.

reimar

parents: 16314

554 }

39b68c2664ec H264-ES demuxer

michael

parents: 9693

555 }

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

556 *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

557 videobuf_len=0;

e0ae2a33857a cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats

nicodvb

parents: 23752

558 } else if(video_codec == VIDEO_VC1) {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

559 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE) {

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

560 int i=sync_video_packet(d_video);

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

561 if(!i) return -1;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

562 if(!read_video_packet(d_video)) return -1; // EOF

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

563 if(i==0x10D) break;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

564 }

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

565 *start=videobuffer;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

566 in_size=videobuf_len;

202327a68635 decode vc1 sequence header and frame it in video_read_frame();

nicodvb

parents: 21809

567 videobuf_len=0;

ea6158be8103 video frame reading cleanup

arpi

parents:

568 } else {

ea6158be8103 video frame reading cleanup

arpi

parents:

569 // frame-based file formats: (AVI,ASF,MOV)

ea6158be8103 video frame reading cleanup

arpi

parents:

570 in_size=ds_get_packet(d_video,start);

ea6158be8103 video frame reading cleanup

arpi

parents:

571 if(in_size<0) return -1; // EOF

ea6158be8103 video frame reading cleanup

arpi

parents:

572 }

ea6158be8103 video frame reading cleanup

arpi

parents:

573

ea6158be8103 video frame reading cleanup

arpi

parents:

574

ea6158be8103 video frame reading cleanup

arpi

parents:

575 //------------------------ frame decoded. --------------------

ea6158be8103 video frame reading cleanup

arpi

parents:

576

ea6158be8103 video frame reading cleanup

arpi

parents:

577 // Increase video timers:

ea6158be8103 video frame reading cleanup

arpi

parents:

578 sh_video->num_frames+=frame_time;

ea6158be8103 video frame reading cleanup

arpi

parents:

579 ++sh_video->num_frames_decoded;

ea6158be8103 video frame reading cleanup

arpi

parents:

580

ea6158be8103 video frame reading cleanup

arpi

parents:

581 frame_time*=sh_video->frametime;

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

582

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

583 // 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

584 if(!force_fps) switch(demuxer->file_format){

9693

1d598bf65571 10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>

alex

parents: 9610

585 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

586 case DEMUXER_TYPE_MATROSKA:

28018

4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org

diego

parents: 27457

587 case DEMUXER_TYPE_MNG:

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

588 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

589 frame_time=d_video->pts-pts1;

13cf65db9ebc fixed playback speed and a-v sync issues

arpi

parents: 6371

590 break;

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

591 case DEMUXER_TYPE_TV:

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

592 case DEMUXER_TYPE_MOV:

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

593 case DEMUXER_TYPE_FILM:

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

594 case DEMUXER_TYPE_VIVO:

19802

f1655de446c4 Support for variable fps OGM files, blessed by Moritz.

diego

parents: 19695

595 case DEMUXER_TYPE_OGG:

b8a8ab95c73d generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated

arpi

parents: 5572

596 case DEMUXER_TYPE_ASF: {

21809

2c473e083c70 Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,

reimar

parents: 21236

597 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

598 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

599 if(d>=0){

13cf65db9ebc fixed playback speed and a-v sync issues

arpi

parents: 6371

600 if(d>0){

19082

a2f20562aac3 Remove support for obsolete and non-free divx4/odivx libraries.

diego

parents: 18942

601 if((int)sh_video->fps==1000)

13cf65db9ebc fixed playback speed and a-v sync issues

arpi

parents: 6371

602 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d));

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

603 sh_video->frametime=d; // 1ms

13cf65db9ebc fixed playback speed and a-v sync issues

arpi

parents: 6371

604 sh_video->fps=1.0f/d;

a8ef08f502c0 cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed

nicodvb

parents: 24832

605 }

5930

68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.

albeu

parents: 5898

606 frame_time = d;

68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.

albeu

parents: 5898

607 } else {

13cf65db9ebc fixed playback speed and a-v sync issues

arpi

parents: 6371

608 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

609 // frame_time = 1/25.0;

ea6158be8103 video frame reading cleanup

arpi

parents:

610 }