RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Stop streaming if we got a server error or message on pnm streaming. 

This is needed to stop playback for pnm streams where mplayer can't
authenticate, and avoid an endless list of "input pnm: read error".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15077 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rtognimp 2005-04-09 13:44:43 +00:00
parent 4493ca4321
commit a319fea77f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmpdemux/pnm.c
View File

@ -301,7 +301,7 @@ static void hexdump (char *buf, int length) {
* and returns number of bytes read * and returns number of bytes read
*/ */
static unsigned int pnm_get_chunk(pnm_t *p, static int pnm_get_chunk(pnm_t *p,
unsigned int max, unsigned int max,
unsigned int *chunk_type, unsigned int *chunk_type,
char *data, int *need_response) { char *data, int *need_response) {
@ -688,12 +688,12 @@ static int pnm_get_stream_chunk(pnm_t *p) {
rm_read (p->s, &p->buffer[8], size-5); rm_read (p->s, &p->buffer[8], size-5);
p->buffer[size+3]=0; p->buffer[size+3]=0;
printf("input_pnm: got message from server while reading stream:\n%s\n", &p->buffer[3]); printf("input_pnm: got message from server while reading stream:\n%s\n", &p->buffer[3]);
return 0; return -1;
} }
if (p->buffer[0] == 'F') if (p->buffer[0] == 'F')
{ {
printf("input_pnm: server error.\n"); printf("input_pnm: server error.\n");
return 0; return -1;
} }
/* skip bytewise to next chunk. /* skip bytewise to next chunk.
@ -808,6 +808,7 @@ int pnm_read (pnm_t *this, char *data, int len) {
char *dest=data; char *dest=data;
char *source=this->recv + this->recv_read; char *source=this->recv + this->recv_read;
int fill=this->recv_size - this->recv_read; int fill=this->recv_size - this->recv_read;
int retval;
if (len < 0) return 0; if (len < 0) return 0;
while (to_copy > fill) { while (to_copy > fill) {
@ -817,10 +818,13 @@ int pnm_read (pnm_t *this, char *data, int len) {
dest += fill; dest += fill;
this->recv_read=0; this->recv_read=0;
if (!pnm_get_stream_chunk (this)) { if ((retval = pnm_get_stream_chunk (this)) <= 0) {
#ifdef LOG #ifdef LOG
printf ("input_pnm: %d of %d bytes provided\n", len-to_copy, len); printf ("input_pnm: %d of %d bytes provided\n", len-to_copy, len);
#endif #endif
if (retval < 0)
return retval;
else
return len-to_copy; return len-to_copy;
} }
source = this->recv; source = this->recv;