mirror of https://github.com/mpv-player/mpv
Drop weird and unnecessary _s/_st suffixes from demuxer struct names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6ed62435a7
commit
5c85286eb5
|
@ -455,7 +455,7 @@ static void demux_seek_rtp(demuxer_t *demuxer, float rel_seek_secs,
|
||||||
mp_msg(MSGT_DEMUX, MSGL_ERR, "Unsupported seek type\n");
|
mp_msg(MSGT_DEMUX, MSGL_ERR, "Unsupported seek type\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg)
|
static int demux_rtp_control(struct demuxer *demuxer, int cmd, void *arg)
|
||||||
{
|
{
|
||||||
Nemesi_DemuxerStreamData * ndsd = demuxer->priv;
|
Nemesi_DemuxerStreamData * ndsd = demuxer->priv;
|
||||||
rtsp_ctrl * ctl = ndsd->rtsp;
|
rtsp_ctrl * ctl = ndsd->rtsp;
|
||||||
|
|
|
@ -666,7 +666,7 @@ demux_packet_t* ReadBufferQueue::getPendingBuffer() {
|
||||||
return dp;
|
return dp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) {
|
static int demux_rtp_control(struct demuxer *demuxer, int cmd, void *arg) {
|
||||||
double endpts = ((RTPState*)demuxer->priv)->mediaSession->playEndTime();
|
double endpts = ((RTPState*)demuxer->priv)->mediaSession->playEndTime();
|
||||||
|
|
||||||
switch(cmd) {
|
switch(cmd) {
|
||||||
|
|
|
@ -193,7 +193,7 @@ void free_demuxer_stream(demux_stream_t *ds)
|
||||||
free(ds);
|
free(ds);
|
||||||
}
|
}
|
||||||
|
|
||||||
demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id)
|
demux_stream_t *new_demuxer_stream(struct demuxer *demuxer, int id)
|
||||||
{
|
{
|
||||||
demux_stream_t *ds = malloc(sizeof(demux_stream_t));
|
demux_stream_t *ds = malloc(sizeof(demux_stream_t));
|
||||||
*ds = (demux_stream_t){
|
*ds = (demux_stream_t){
|
||||||
|
|
|
@ -118,7 +118,7 @@
|
||||||
#define MP_INPUT_BUFFER_PADDING_SIZE 8
|
#define MP_INPUT_BUFFER_PADDING_SIZE 8
|
||||||
|
|
||||||
// Holds one packet/frame/whatever
|
// Holds one packet/frame/whatever
|
||||||
typedef struct demux_packet_st {
|
typedef struct demux_packet {
|
||||||
int len;
|
int len;
|
||||||
double pts;
|
double pts;
|
||||||
double endpts;
|
double endpts;
|
||||||
|
@ -127,8 +127,8 @@ typedef struct demux_packet_st {
|
||||||
unsigned char* buffer;
|
unsigned char* buffer;
|
||||||
int flags; // keyframe, etc
|
int flags; // keyframe, etc
|
||||||
int refcount; //refcounter for the master packet, if 0, buffer can be free()d
|
int refcount; //refcounter for the master packet, if 0, buffer can be free()d
|
||||||
struct demux_packet_st* master; //pointer to the master packet if this one is a cloned one
|
struct demux_packet* master; //pointer to the master packet if this one is a cloned one
|
||||||
struct demux_packet_st* next;
|
struct demux_packet* next;
|
||||||
} demux_packet_t;
|
} demux_packet_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -151,7 +151,7 @@ typedef struct {
|
||||||
demux_packet_t *last; // append new packets from input stream to here
|
demux_packet_t *last; // append new packets from input stream to here
|
||||||
demux_packet_t *current;// needed for refcounting of the buffer
|
demux_packet_t *current;// needed for refcounting of the buffer
|
||||||
int id; // stream ID (for multiple audio/video streams)
|
int id; // stream ID (for multiple audio/video streams)
|
||||||
struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
|
struct demuxer *demuxer; // parent demuxer structure (stream handler)
|
||||||
// ---- asf -----
|
// ---- asf -----
|
||||||
demux_packet_t *asf_packet; // read asf fragments here
|
demux_packet_t *asf_packet; // read asf fragments here
|
||||||
int asf_seq;
|
int asf_seq;
|
||||||
|
@ -161,7 +161,7 @@ typedef struct {
|
||||||
void* sh;
|
void* sh;
|
||||||
} demux_stream_t;
|
} demux_stream_t;
|
||||||
|
|
||||||
typedef struct demuxer_info_st {
|
typedef struct demuxer_info {
|
||||||
char *name;
|
char *name;
|
||||||
char *author;
|
char *author;
|
||||||
char *encoder;
|
char *encoder;
|
||||||
|
@ -173,7 +173,7 @@ typedef struct demuxer_info_st {
|
||||||
#define MAX_V_STREAMS 256
|
#define MAX_V_STREAMS 256
|
||||||
#define MAX_S_STREAMS 256
|
#define MAX_S_STREAMS 256
|
||||||
|
|
||||||
struct demuxer_st;
|
struct demuxer;
|
||||||
|
|
||||||
extern int correct_pts;
|
extern int correct_pts;
|
||||||
extern int user_correct_pts;
|
extern int user_correct_pts;
|
||||||
|
@ -181,7 +181,7 @@ extern int user_correct_pts;
|
||||||
/**
|
/**
|
||||||
* Demuxer description structure
|
* Demuxer description structure
|
||||||
*/
|
*/
|
||||||
typedef struct demuxers_desc_st {
|
typedef struct demuxer_desc {
|
||||||
const char *info; ///< What is it (long name and/or description)
|
const char *info; ///< What is it (long name and/or description)
|
||||||
const char *name; ///< Demuxer name, used with -demuxer switch
|
const char *name; ///< Demuxer name, used with -demuxer switch
|
||||||
const char *shortdesc; ///< Description printed at demuxer detection
|
const char *shortdesc; ///< Description printed at demuxer detection
|
||||||
|
@ -192,26 +192,26 @@ typedef struct demuxers_desc_st {
|
||||||
int safe_check; ///< If 1 detection is safe and fast, do it before file extension check
|
int safe_check; ///< If 1 detection is safe and fast, do it before file extension check
|
||||||
|
|
||||||
/// Check if can demux the file, return DEMUXER_TYPE_xxx on success
|
/// Check if can demux the file, return DEMUXER_TYPE_xxx on success
|
||||||
int (*check_file)(struct demuxer_st *demuxer); ///< Mandatory if safe_check == 1, else optional
|
int (*check_file)(struct demuxer *demuxer); ///< Mandatory if safe_check == 1, else optional
|
||||||
/// Get packets from file, return 0 on eof
|
/// Get packets from file, return 0 on eof
|
||||||
int (*fill_buffer)(struct demuxer_st *demuxer, demux_stream_t *ds); ///< Mandatory
|
int (*fill_buffer)(struct demuxer *demuxer, demux_stream_t *ds); ///< Mandatory
|
||||||
/// Open the demuxer, return demuxer on success, NULL on failure
|
/// Open the demuxer, return demuxer on success, NULL on failure
|
||||||
struct demuxer_st* (*open)(struct demuxer_st *demuxer); ///< Optional
|
struct demuxer* (*open)(struct demuxer *demuxer); ///< Optional
|
||||||
/// Close the demuxer
|
/// Close the demuxer
|
||||||
void (*close)(struct demuxer_st *demuxer); ///< Optional
|
void (*close)(struct demuxer *demuxer); ///< Optional
|
||||||
// Seek
|
// Seek
|
||||||
void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
|
void (*seek)(struct demuxer *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
|
||||||
// Control
|
// Control
|
||||||
int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional
|
int (*control)(struct demuxer *demuxer, int cmd, void *arg); ///< Optional
|
||||||
} demuxer_desc_t;
|
} demuxer_desc_t;
|
||||||
|
|
||||||
typedef struct demux_chapter_s
|
typedef struct demux_chapter
|
||||||
{
|
{
|
||||||
uint64_t start, end;
|
uint64_t start, end;
|
||||||
char* name;
|
char* name;
|
||||||
} demux_chapter_t;
|
} demux_chapter_t;
|
||||||
|
|
||||||
typedef struct demux_attachment_s
|
typedef struct demux_attachment
|
||||||
{
|
{
|
||||||
char* name;
|
char* name;
|
||||||
char* type;
|
char* type;
|
||||||
|
@ -219,7 +219,7 @@ typedef struct demux_attachment_s
|
||||||
unsigned int data_size;
|
unsigned int data_size;
|
||||||
} demux_attachment_t;
|
} demux_attachment_t;
|
||||||
|
|
||||||
typedef struct demuxer_st {
|
typedef struct demuxer {
|
||||||
const demuxer_desc_t *desc; ///< Demuxer description structure
|
const demuxer_desc_t *desc; ///< Demuxer description structure
|
||||||
off_t filepos; // input stream current pos.
|
off_t filepos; // input stream current pos.
|
||||||
off_t movi_start;
|
off_t movi_start;
|
||||||
|
@ -334,7 +334,7 @@ static inline void *realloc_struct(void *ptr, size_t nmemb, size_t size) {
|
||||||
return realloc(ptr, nmemb * size);
|
return realloc(ptr, nmemb * size);
|
||||||
}
|
}
|
||||||
|
|
||||||
demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id);
|
demux_stream_t* new_demuxer_stream(struct demuxer *demuxer,int id);
|
||||||
demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename);
|
demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename);
|
||||||
void free_demuxer_stream(demux_stream_t *ds);
|
void free_demuxer_stream(demux_stream_t *ds);
|
||||||
void free_demuxer(demuxer_t *demuxer);
|
void free_demuxer(demuxer_t *demuxer);
|
||||||
|
|
Loading…
Reference in New Issue