mirror of https://github.com/mpv-player/mpv
Merge svn changes up to r30702
This commit is contained in:
commit
194efde18f
|
@ -1,5 +1,6 @@
|
||||||
the nut spec has been moved to another svn repo you can find it at:
|
The NUT specification has been moved to another Subversion repository.
|
||||||
|
You can find it at:
|
||||||
http://svn.mplayerhq.hu/nut/docs/nut.txt?view=markup
|
http://svn.mplayerhq.hu/nut/docs/nut.txt?view=markup
|
||||||
|
|
||||||
its future location will be in a git repository, ill update this file
|
Its future location will be in a git repository. This file will be
|
||||||
here when its location changes again
|
updated when its location changes again.
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
oggless-xiph-codecs.txt has been moved to another svn repo you can find it at:
|
oggless-xiph-codecs.txt has been moved to another Subversion repository.
|
||||||
|
You can find it at:
|
||||||
http://svn.mplayerhq.hu/nut/docs/oggless-xiph-codecs.txt?view=markup
|
http://svn.mplayerhq.hu/nut/docs/oggless-xiph-codecs.txt?view=markup
|
||||||
|
|
||||||
its future location will be in a git repository, ill update this file
|
Its future location will be in a git repository. This file will be
|
||||||
here when its location changes again
|
updated when its location changes again.
|
||||||
|
|
|
@ -849,7 +849,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if 1
|
|
||||||
// emulate some functions:
|
// emulate some functions:
|
||||||
switch(reg->eax){
|
switch(reg->eax){
|
||||||
// memory management:
|
// memory management:
|
||||||
|
@ -895,7 +894,6 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
|
||||||
#endif
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
switch(reg->eax){
|
switch(reg->eax){
|
||||||
|
|
|
@ -4611,6 +4611,7 @@ static INT WINAPI expMessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type
|
||||||
* \param dest jump target
|
* \param dest jump target
|
||||||
*/
|
*/
|
||||||
void exp_EH_prolog(void *dest);
|
void exp_EH_prolog(void *dest);
|
||||||
|
void exp_EH_prolog_dummy(void);
|
||||||
//! just a dummy function that acts a container for the asm section
|
//! just a dummy function that acts a container for the asm section
|
||||||
void exp_EH_prolog_dummy(void) {
|
void exp_EH_prolog_dummy(void) {
|
||||||
__asm__ volatile (
|
__asm__ volatile (
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "mangle.h"
|
#include "mangle.h"
|
||||||
#include "mpg123.h"
|
#include "mpg123.h"
|
||||||
|
|
||||||
extern void (*dct64_MMX_func)(short*, short*, real*);
|
|
||||||
static const unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
|
static const unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
|
||||||
static const unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
|
static const unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
|
||||||
const unsigned int __attribute__((aligned(16))) costab_mmx[] =
|
const unsigned int __attribute__((aligned(16))) costab_mmx[] =
|
||||||
|
|
|
@ -129,6 +129,15 @@ void dct36_3dnow(real *, real *, real *, real *, real *);
|
||||||
void dct36_3dnowex(real *, real *, real *, real *, real *);
|
void dct36_3dnowex(real *, real *, real *, real *, real *);
|
||||||
void dct36_sse(real *, real *, real *, real *, real *);
|
void dct36_sse(real *, real *, real *, real *, real *);
|
||||||
|
|
||||||
|
void dct64_MMX(short *, short *, real *);
|
||||||
|
void dct64_MMX_3dnow(short *, short *, real *);
|
||||||
|
void dct64_MMX_3dnowex(short *, short *, real *);
|
||||||
|
void dct64_sse(short *, short *, real *);
|
||||||
|
void dct64_altivec(real *, real *, real *);
|
||||||
|
void (*dct64_MMX_func)(short *, short *, real *);
|
||||||
|
|
||||||
|
void mp3lib_dct64(real *, real *, real *);
|
||||||
|
|
||||||
typedef int (*synth_func_t)( real *,int,short * );
|
typedef int (*synth_func_t)( real *,int,short * );
|
||||||
typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
|
typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
|
||||||
|
|
||||||
|
|
|
@ -383,14 +383,6 @@ static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs
|
||||||
/* PUBLIC FUNCTIONS */
|
/* PUBLIC FUNCTIONS */
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
/* It's hidden from gcc in assembler */
|
|
||||||
void dct64_MMX(short *, short *, real *);
|
|
||||||
void dct64_MMX_3dnow(short *, short *, real *);
|
|
||||||
void dct64_MMX_3dnowex(short *, short *, real *);
|
|
||||||
void dct64_sse(short *, short *, real *);
|
|
||||||
void dct64_altivec(real *, real *, real *);
|
|
||||||
void (*dct64_MMX_func)(short *, short *, real *);
|
|
||||||
|
|
||||||
#include "layer2.c"
|
#include "layer2.c"
|
||||||
#include "layer3.c"
|
#include "layer3.c"
|
||||||
#include "layer1.c"
|
#include "layer1.c"
|
||||||
|
|
|
@ -47,8 +47,6 @@ extern const mime_struct_t mime_type_table[];
|
||||||
extern int stream_cache_size;
|
extern int stream_cache_size;
|
||||||
extern int network_bandwidth;
|
extern int network_bandwidth;
|
||||||
|
|
||||||
int http_seek(stream_t *stream, off_t pos);
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
unsigned metaint;
|
unsigned metaint;
|
||||||
unsigned metapos;
|
unsigned metapos;
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "stream.h"
|
||||||
#include "url.h"
|
#include "url.h"
|
||||||
#include "http.h"
|
#include "http.h"
|
||||||
|
|
||||||
|
@ -52,29 +53,6 @@ typedef struct {
|
||||||
int demuxer_type;
|
int demuxer_type;
|
||||||
} mime_struct_t;
|
} mime_struct_t;
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
streaming_stopped_e,
|
|
||||||
streaming_playing_e
|
|
||||||
} streaming_status;
|
|
||||||
|
|
||||||
typedef struct streaming_control {
|
|
||||||
URL_t *url;
|
|
||||||
streaming_status status;
|
|
||||||
int buffering; // boolean
|
|
||||||
unsigned int prebuffer_size;
|
|
||||||
char *buffer;
|
|
||||||
unsigned int buffer_size;
|
|
||||||
unsigned int buffer_pos;
|
|
||||||
unsigned int bandwidth; // The downstream available
|
|
||||||
int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
|
|
||||||
int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
|
|
||||||
void *data;
|
|
||||||
// hacks for asf
|
|
||||||
int *audio_id_ptr;
|
|
||||||
int *video_id_ptr;
|
|
||||||
} streaming_ctrl_t;
|
|
||||||
|
|
||||||
//int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url );
|
|
||||||
streaming_ctrl_t *streaming_ctrl_new(void);
|
streaming_ctrl_t *streaming_ctrl_new(void);
|
||||||
int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);
|
int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);
|
||||||
|
|
||||||
|
@ -88,4 +66,7 @@ HTTP_header_t *http_read_response(int fd);
|
||||||
int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
|
int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
|
||||||
URL_t* check4proxies(URL_t *url);
|
URL_t* check4proxies(URL_t *url);
|
||||||
|
|
||||||
|
void fixup_network_stream_cache(stream_t *stream);
|
||||||
|
int http_seek(stream_t *stream, off_t pos);
|
||||||
|
|
||||||
#endif /* MPLAYER_NETWORK_H */
|
#endif /* MPLAYER_NETWORK_H */
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
|
#include "url.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -89,9 +90,27 @@
|
||||||
#define STREAM_CTRL_SET_ANGLE 11
|
#define STREAM_CTRL_SET_ANGLE 11
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_NETWORK
|
typedef enum {
|
||||||
#include "network.h"
|
streaming_stopped_e,
|
||||||
#endif
|
streaming_playing_e
|
||||||
|
} streaming_status;
|
||||||
|
|
||||||
|
typedef struct streaming_control {
|
||||||
|
URL_t *url;
|
||||||
|
streaming_status status;
|
||||||
|
int buffering; // boolean
|
||||||
|
unsigned int prebuffer_size;
|
||||||
|
char *buffer;
|
||||||
|
unsigned int buffer_size;
|
||||||
|
unsigned int buffer_pos;
|
||||||
|
unsigned int bandwidth; // The downstream available
|
||||||
|
int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
|
||||||
|
int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
|
||||||
|
void *data;
|
||||||
|
// hacks for asf
|
||||||
|
int *audio_id_ptr;
|
||||||
|
int *video_id_ptr;
|
||||||
|
} streaming_ctrl_t;
|
||||||
|
|
||||||
struct stream;
|
struct stream;
|
||||||
typedef struct stream_info_st {
|
typedef struct stream_info_st {
|
||||||
|
@ -143,6 +162,10 @@ typedef struct stream {
|
||||||
unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
|
unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
|
||||||
} stream_t;
|
} stream_t;
|
||||||
|
|
||||||
|
#ifdef CONFIG_NETWORK
|
||||||
|
#include "network.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
int stream_fill_buffer(stream_t *s);
|
int stream_fill_buffer(stream_t *s);
|
||||||
int stream_seek_long(stream_t *s, off_t pos);
|
int stream_seek_long(stream_t *s, off_t pos);
|
||||||
|
|
||||||
|
@ -156,7 +179,6 @@ int cache_stream_seek_long(stream_t *s,off_t pos);
|
||||||
#define cache_stream_seek_long(x,y) stream_seek_long(x,y)
|
#define cache_stream_seek_long(x,y) stream_seek_long(x,y)
|
||||||
#define stream_enable_cache(x,y,z,w) 1
|
#define stream_enable_cache(x,y,z,w) 1
|
||||||
#endif
|
#endif
|
||||||
void fixup_network_stream_cache(stream_t *stream);
|
|
||||||
int stream_write_buffer(stream_t *s, unsigned char *buf, int len);
|
int stream_write_buffer(stream_t *s, unsigned char *buf, int len);
|
||||||
|
|
||||||
inline static int stream_read_char(stream_t *s){
|
inline static int stream_read_char(stream_t *s){
|
||||||
|
|
Loading…
Reference in New Issue