mirror of https://github.com/mpv-player/mpv
Remove now unused parts of nuppelvideo.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28908 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
601d694829
commit
3a0ffa5bf4
|
@ -20,29 +20,6 @@
|
|||
#ifndef MPLAYER_NUPPELVIDEO_H
|
||||
#define MPLAYER_NUPPELVIDEO_H
|
||||
|
||||
#include "libavutil/intfloat_readwrite.h"
|
||||
|
||||
typedef struct __attribute__((packed)) rtfileheader
|
||||
{
|
||||
char finfo[12]; // "NuppelVideo" + \0
|
||||
char version[5]; // "0.05" + \0
|
||||
char pad1[3];
|
||||
int width;
|
||||
int height;
|
||||
int desiredwidth; // 0 .. as it is
|
||||
int desiredheight; // 0 .. as it is
|
||||
char pimode; // P .. progressive
|
||||
// I .. interlaced (2 half pics) [NI]
|
||||
char pad2[3];
|
||||
double aspect; // 1.0 .. square pixel (1.5 .. e.g. width=480: width*1.5=720
|
||||
// for capturing for svcd material
|
||||
double fps;
|
||||
int videoblocks; // count of video-blocks -1 .. unknown 0 .. no video
|
||||
int audioblocks; // count of audio-blocks -1 .. unknown 0 .. no audio
|
||||
int textsblocks; // count of text-blocks -1 .. unknown 0 .. no text
|
||||
int keyframedist;
|
||||
} rtfileheader;
|
||||
|
||||
typedef struct __attribute__((packed)) rtframeheader
|
||||
{
|
||||
char frametype; // A .. Audio, V .. Video, S .. Sync, T .. Text
|
||||
|
@ -93,87 +70,11 @@ typedef struct __attribute__((packed)) rtframeheader
|
|||
// R: do not use here! (fixed 'RTjjjjjjjjjjjjjj')
|
||||
} rtframeheader;
|
||||
|
||||
/* for MythTV */
|
||||
typedef struct __attribute__((packed)) extendeddata
|
||||
{
|
||||
int version; // yes, this is repeated from the file header
|
||||
int video_fourcc; // video encoding method used
|
||||
int audio_fourcc; // audio encoding method used
|
||||
// generic data
|
||||
int audio_sample_rate;
|
||||
int audio_bits_per_sample;
|
||||
int audio_channels;
|
||||
// codec specific
|
||||
// mp3lame
|
||||
int audio_compression_ratio;
|
||||
int audio_quality;
|
||||
// rtjpeg
|
||||
int rtjpeg_quality;
|
||||
int rtjpeg_luma_filter;
|
||||
int rtjpeg_chroma_filter;
|
||||
// libavcodec
|
||||
int lavc_bitrate;
|
||||
int lavc_qmin;
|
||||
int lavc_qmax;
|
||||
int lavc_maxqdiff;
|
||||
// unused for later -- total size of 128 integers.
|
||||
// new fields must be added at the end, above this comment.
|
||||
int expansion[113];
|
||||
} extendeddata;
|
||||
|
||||
#define FRAMEHEADERSIZE sizeof(rtframeheader)
|
||||
#define FILEHEADERSIZE sizeof(rtfileheader)
|
||||
|
||||
typedef struct vidbuffertype
|
||||
{
|
||||
int sample;
|
||||
int timecode;
|
||||
int freeToEncode;
|
||||
int freeToBuffer;
|
||||
unsigned char *buffer_offset;
|
||||
} vidbuffertyp;
|
||||
|
||||
typedef struct audbuffertype
|
||||
{
|
||||
int sample;
|
||||
int timecode;
|
||||
int freeToEncode;
|
||||
int freeToBuffer;
|
||||
unsigned char *buffer_offset;
|
||||
} audbuffertyp;
|
||||
|
||||
#define le2me_rtfileheader(h) { \
|
||||
(h)->width = le2me_32((h)->width); \
|
||||
(h)->height = le2me_32((h)->height); \
|
||||
(h)->desiredwidth = le2me_32((h)->desiredwidth); \
|
||||
(h)->desiredheight = le2me_32((h)->desiredheight); \
|
||||
(h)->aspect = av_int2dbl(le2me_64(*(uint64_t *)&(h)->aspect));\
|
||||
(h)->fps = av_int2dbl(le2me_64(*(uint64_t *)&(h)->fps)); \
|
||||
(h)->videoblocks = le2me_32((h)->videoblocks); \
|
||||
(h)->audioblocks = le2me_32((h)->audioblocks); \
|
||||
(h)->textsblocks = le2me_32((h)->textsblocks); \
|
||||
(h)->keyframedist = le2me_32((h)->keyframedist); \
|
||||
}
|
||||
#define le2me_rtframeheader(h) { \
|
||||
(h)->timecode = le2me_32((h)->timecode); \
|
||||
(h)->packetlength = le2me_32((h)->packetlength); \
|
||||
}
|
||||
#define le2me_extendeddata(h) { \
|
||||
(h)->version = le2me_32((h)->version); \
|
||||
(h)->video_fourcc = le2me_32((h)->video_fourcc); \
|
||||
(h)->audio_fourcc = le2me_32((h)->audio_fourcc); \
|
||||
(h)->audio_sample_rate = le2me_32((h)->audio_sample_rate); \
|
||||
(h)->audio_bits_per_sample = le2me_32((h)->audio_bits_per_sample);\
|
||||
(h)->audio_channels = le2me_32((h)->audio_channels); \
|
||||
(h)->audio_compression_ratio = le2me_32((h)->audio_compression_ratio);\
|
||||
(h)->audio_quality = le2me_32((h)->audio_quality); \
|
||||
(h)->rtjpeg_quality = le2me_32((h)->rtjpeg_quality); \
|
||||
(h)->rtjpeg_luma_filter = le2me_32((h)->rtjpeg_luma_filter); \
|
||||
(h)->rtjpeg_chroma_filter = le2me_32((h)->rtjpeg_chroma_filter);\
|
||||
(h)->lavc_bitrate = le2me_32((h)->lavc_bitrate); \
|
||||
(h)->lavc_qmin = le2me_32((h)->lavc_qmin); \
|
||||
(h)->lavc_qmax = le2me_32((h)->lavc_qmax); \
|
||||
(h)->lavc_maxqdiff = le2me_32((h)->lavc_maxqdiff); \
|
||||
}
|
||||
|
||||
#endif /* MPLAYER_NUPPELVIDEO_H */
|
||||
|
|
Loading…
Reference in New Issue