libogg: Update to pristine version 1.3.3

This commit is contained in:
Rémi Verschelde 2018-01-13 12:59:25 +01:00
parent c01575b312
commit de0b31edd5
5 changed files with 51 additions and 21 deletions

View File

@ -108,7 +108,7 @@ Files extracted from upstream source:
## libogg
- Upstream: https://www.xiph.org/ogg
- Version: 1.3.2
- Version: 1.3.3
- License: BSD-3-Clause
Files extracted from upstream source:

View File

@ -11,7 +11,7 @@
********************************************************************
function: packing variable sized words into an octet stream
last mod: $Id: bitwise.c 19149 2014-05-27 16:26:23Z giles $
last mod: $Id$
********************************************************************/

View File

@ -12,7 +12,7 @@
function: code raw packets into framed OggSquish stream and
decode Ogg streams back into raw packets
last mod: $Id: framing.c 18758 2013-01-08 16:29:56Z tterribe $
last mod: $Id$
note: The CRC code is directly derived from public domain code by
Ross Williams (ross@guest.adelaide.edu.au). See docs/framing.html
@ -875,6 +875,7 @@ int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){
some segments */
if(continued){
if(os->lacing_fill<1 ||
(os->lacing_vals[os->lacing_fill-1]&0xff)<255 ||
os->lacing_vals[os->lacing_fill-1]==0x400){
bos=0;
for(;segptr<segments;segptr++){
@ -1492,6 +1493,34 @@ const int head3_7[] = {0x4f,0x67,0x67,0x53,0,0x05,
1,
0};
int compare_packet(const ogg_packet *op1, const ogg_packet *op2){
if(op1->packet!=op2->packet){
fprintf(stderr,"op1->packet != op2->packet\n");
return(1);
}
if(op1->bytes!=op2->bytes){
fprintf(stderr,"op1->bytes != op2->bytes\n");
return(1);
}
if(op1->b_o_s!=op2->b_o_s){
fprintf(stderr,"op1->b_o_s != op2->b_o_s\n");
return(1);
}
if(op1->e_o_s!=op2->e_o_s){
fprintf(stderr,"op1->e_o_s != op2->e_o_s\n");
return(1);
}
if(op1->granulepos!=op2->granulepos){
fprintf(stderr,"op1->granulepos != op2->granulepos\n");
return(1);
}
if(op1->packetno!=op2->packetno){
fprintf(stderr,"op1->packetno != op2->packetno\n");
return(1);
}
return(0);
}
void test_pack(const int *pl, const int **headers, int byteskip,
int pageskip, int packetskip){
unsigned char *data=_ogg_malloc(1024*1024); /* for scripted test cases only */
@ -1600,7 +1629,7 @@ void test_pack(const int *pl, const int **headers, int byteskip,
ogg_stream_packetout(&os_de,&op_de); /* just catching them all */
/* verify peek and out match */
if(memcmp(&op_de,&op_de2,sizeof(op_de))){
if(compare_packet(&op_de,&op_de2)){
fprintf(stderr,"packetout != packetpeek! pos=%ld\n",
depacket);
exit(1);

View File

@ -11,7 +11,7 @@
********************************************************************
function: toplevel libogg include
last mod: $Id: ogg.h 18044 2011-08-01 17:55:20Z gmaxwell $
last mod: $Id$
********************************************************************/
#ifndef _OGG_H

View File

@ -11,7 +11,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $
last mod: $Id$
********************************************************************/
#ifndef _OS_TYPES_H
@ -49,23 +49,24 @@
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
# else
/* MSVC/Borland */
typedef __int64 ogg_int64_t;
typedef __int32 ogg_int32_t;
typedef unsigned __int32 ogg_uint32_t;
typedef __int16 ogg_int16_t;
typedef unsigned __int16 ogg_uint16_t;
# if defined(_MSC_VER) && (_MSC_VER >= 1800) /* MSVC 2013 and newer */
# include <stdint.h>
typedef int16_t ogg_int16_t;
typedef uint16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef uint32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
typedef uint64_t ogg_uint64_t;
# else
/* MSVC/Borland */
typedef __int64 ogg_int64_t;
typedef __int32 ogg_int32_t;
typedef unsigned __int32 ogg_uint32_t;
typedef __int16 ogg_int16_t;
typedef unsigned __int16 ogg_uint16_t;
# endif
# endif
#elif defined(__MACOS__)
# include <sys/types.h>
typedef SInt16 ogg_int16_t;
typedef UInt16 ogg_uint16_t;
typedef SInt32 ogg_int32_t;
typedef UInt32 ogg_uint32_t;
typedef SInt64 ogg_int64_t;
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
# include <inttypes.h>