Attachment #704016 for bug #786543

View | Details | Raw Unified | Return to bug 786543
Collapse All | Expand All

Lines 30-36 Link Here

(-)a/p_ac3.cpp (-1 / +1 lines)
30	ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec,	30	ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec,
31	int nchannels, int nbitrate,	31	int nchannels, int nbitrate,
32	audio_sync_t nasync, range_t nrange,	32	audio_sync_t nasync, range_t nrange,
33	char **ncomments) throw (error_c) : q_c() {	33	char **ncomments) : q_c() {
34	serialno = create_unique_serial();	34	serialno = create_unique_serial();
35	ogg_stream_init(&os, serialno);	35	ogg_stream_init(&os, serialno);
36	packetno = 0;	36	packetno = 0;

Lines 40-46 Link Here

(-)a/p_ac3.h (-1 / +1 lines)
40	public:	40	public:
41	ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,	41	ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
42	int nbitrate, audio_sync_t *nasync,	42	int nbitrate, audio_sync_t *nasync,
43	range_t nrange, char *ncomments) throw (error_c);	43	range_t nrange, char *ncomments);
44	virtual ~ac3_packetizer_c();	44	virtual ~ac3_packetizer_c();
45		45
46	virtual int process(char *buf, int size, int last_frame);	46	virtual int process(char *buf, int size, int last_frame);

Lines 28-34 Link Here

(-)a/p_index.cpp (-1 / +1 lines)
28	#include "p_index.h"	28	#include "p_index.h"
29	#include "vorbis_header_utils.h"	29	#include "vorbis_header_utils.h"
30		30
31	index_packetizer_c::index_packetizer_c(int nserial) throw (error_c) : q_c() {	31	index_packetizer_c::index_packetizer_c(int nserial) : q_c() {
32	serialno = create_unique_serial();	32	serialno = create_unique_serial();
33	ogg_stream_init(&os, serialno);	33	ogg_stream_init(&os, serialno);
34	granulepos = 0;	34	granulepos = 0;

Lines 33-39 Link Here

(-)a/p_index.h (-1 / +1 lines)
33	ogg_int64_t granulepos, packetno;	33	ogg_int64_t granulepos, packetno;
34	int serial;	34	int serial;
35	public:	35	public:
36	index_packetizer_c(int nserial) throw (error_c);	36	index_packetizer_c(int nserial);
37	virtual ~index_packetizer_c();	37	virtual ~index_packetizer_c();
38		38
39	virtual int process(idx_entry *entries, int num);	39	virtual int process(idx_entry *entries, int num);

Lines 30-36 Link Here

(-)a/p_mp3.cpp (-1 / +1 lines)
30	mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec,	30	mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec,
31	int nchannels, int nmp3rate,	31	int nchannels, int nmp3rate,
32	audio_sync_t nasync, range_t nrange,	32	audio_sync_t nasync, range_t nrange,
33	char **ncomments) throw (error_c) : q_c() {	33	char **ncomments) : q_c() {
34	serialno = create_unique_serial();	34	serialno = create_unique_serial();
35	ogg_stream_init(&os, serialno);	35	ogg_stream_init(&os, serialno);
36	packetno = 0;	36	packetno = 0;

Lines 40-46 Link Here

(-)a/p_mp3.h (-1 / +1 lines)
40	public:	40	public:
41	mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,	41	mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
42	int nmp3rate, audio_sync_t *nasync,	42	int nmp3rate, audio_sync_t *nasync,
43	range_t nrange, char *ncomments) throw (error_c);	43	range_t nrange, char *ncomments);
44	virtual ~mp3_packetizer_c();	44	virtual ~mp3_packetizer_c();
45		45
46	virtual int process(char *buf, int size, int last_frame);	46	virtual int process(char *buf, int size, int last_frame);

Lines 29-35 Link Here

(-)a/p_pcm.cpp (-1 / +1 lines)
29	pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec,	29	pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec,
30	int nchannels, int nbits_per_sample,	30	int nchannels, int nbits_per_sample,
31	audio_sync_t nasync, range_t nrange,	31	audio_sync_t nasync, range_t nrange,
32	char **ncomments) throw (error_c) : q_c() {	32	char **ncomments) : q_c() {
33	serialno = create_unique_serial();	33	serialno = create_unique_serial();
34	ogg_stream_init(&os, serialno);	34	ogg_stream_init(&os, serialno);
35	packetno = 0;	35	packetno = 0;

Lines 37-43 Link Here

(-)a/p_pcm.h (-1 / +1 lines)
37	public:	37	public:
38	pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels,	38	pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
39	int nbits_per_sample, audio_sync_t *nasync,	39	int nbits_per_sample, audio_sync_t *nasync,
40	range_t nrange, char *ncomments) throw (error_c);	40	range_t nrange, char *ncomments);
41	virtual ~pcm_packetizer_c();	41	virtual ~pcm_packetizer_c();
42		42
43	virtual int process(char *buf, int size, int last_frame);	43	virtual int process(char *buf, int size, int last_frame);

Lines 29-35 Link Here

(-)a/p_textsubs.cpp (-1 / +1 lines)
29		29
30	textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync,	30	textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync,
31	range_t nrange, char *ncomments)	31	range_t nrange, char *ncomments)
32	throw (error_c) : q_c() {	32	: q_c() {
33	serialno = create_unique_serial();	33	serialno = create_unique_serial();
34	ogg_stream_init(&os, serialno);	34	ogg_stream_init(&os, serialno);
35	packetno = 0;	35	packetno = 0;

Lines 30-36 Link Here

(-)a/p_textsubs.h (-1 / +1 lines)
30		30
31	public:	31	public:
32	textsubs_packetizer_c(audio_sync_t nasync, range_t nrange,	32	textsubs_packetizer_c(audio_sync_t nasync, range_t nrange,
33	char **ncomments) throw (error_c);	33	char **ncomments);
34	virtual ~textsubs_packetizer_c();	34	virtual ~textsubs_packetizer_c();
35		35
36	virtual int process(ogg_int64_t start, ogg_int64_t end, char *_subs,	36	virtual int process(ogg_int64_t start, ogg_int64_t end, char *_subs,

Lines 31-37 Link Here

(-)a/p_video.cpp (-1 / +1 lines)
31	int nheight, int nbpp,	31	int nheight, int nbpp,
32	int nmax_frame_size, audio_sync_t *as,	32	int nmax_frame_size, audio_sync_t *as,
33	range_t nrange, char *ncomments)	33	range_t nrange, char *ncomments)
34	throw (error_c) : q_c() {	34	: q_c() {
35	serialno = create_unique_serial();	35	serialno = create_unique_serial();
36	ogg_stream_init(&os, serialno);	36	ogg_stream_init(&os, serialno);
37	packetno = 0;	37	packetno = 0;

Lines 35-41 Link Here

(-)a/p_video.h (-1 / +1 lines)
35	range_t range;	35	range_t range;
36	public:	36	public:
37	video_packetizer_c(char , double, int, int, int, int, audio_sync_t ,	37	video_packetizer_c(char , double, int, int, int, int, audio_sync_t ,
38	range_t nrange, char *ncomments) throw (error_c);	38	range_t nrange, char *ncomments);
39	virtual ~video_packetizer_c();	39	virtual ~video_packetizer_c();
40		40
41	virtual int process(char *buf, int size, int num_frames, int key,	41	virtual int process(char *buf, int size, int num_frames, int key,

Lines 34-40 Link Here

(-)a/p_vobsub.cpp (-1 / +1 lines)
34	char *nid, int nindex,	34	char *nid, int nindex,
35	audio_sync_t *nasync,	35	audio_sync_t *nasync,
36	range_t nrange, char *ncomments)	36	range_t nrange, char *ncomments)
37	throw (error_c) : q_c() {	37	: q_c() {
38	char buffer[50];	38	char buffer[50];
39	serialno = create_unique_serial();	39	serialno = create_unique_serial();
40	ogg_stream_init(&os, serialno);	40	ogg_stream_init(&os, serialno);

Lines 43-49 Link Here

(-)a/p_vobsub.h (-1 / +1 lines)
43	vobsub_packetizer_c(int nwidth, int nheight, char *npalette,	43	vobsub_packetizer_c(int nwidth, int nheight, char *npalette,
44	int nlangidx, char *nid, int nindex,	44	int nlangidx, char *nid, int nindex,
45	audio_sync_t nasync, range_t nrange,	45	audio_sync_t nasync, range_t nrange,
46	char **ncomments) throw (error_c);	46	char **ncomments);
47	virtual ~vobsub_packetizer_c();	47	virtual ~vobsub_packetizer_c();
48		48
49	virtual int process(ogg_int64_t start, ogg_int64_t end, char *subs,	49	virtual int process(ogg_int64_t start, ogg_int64_t end, char *subs,

Lines 30-36 Link Here

(-)a/p_vorbis.cpp (-1 / +1 lines)
30	#include "vorbis_header_utils.h"	30	#include "vorbis_header_utils.h"
31		31
32	vorbis_packetizer_c::vorbis_packetizer_c(audio_sync_t nasync, range_t nrange,	32	vorbis_packetizer_c::vorbis_packetizer_c(audio_sync_t nasync, range_t nrange,
33	char **ncomments) throw (error_c)	33	char **ncomments)
34	: q_c() {	34	: q_c() {
35	packetno = 0;	35	packetno = 0;
36	old_granulepos = 0;	36	old_granulepos = 0;

Lines 37-43 Link Here

(-)a/p_vorbis.h (-1 / +1 lines)
37		37
38	public:	38	public:
39	vorbis_packetizer_c(audio_sync_t nasync, range_t nrange, char **ncomments)	39	vorbis_packetizer_c(audio_sync_t nasync, range_t nrange, char **ncomments)
40	throw (error_c);	40	;
41	virtual ~vorbis_packetizer_c();	41	virtual ~vorbis_packetizer_c();
42		42
43	virtual int process(ogg_packet *op, ogg_int64_t gran);	43	virtual int process(ogg_packet *op, ogg_int64_t gran);

Lines 21-27 Link Here

(-)a/queue.cpp (-1 / +1 lines)
21	#include "ogmmerge.h"	21	#include "ogmmerge.h"
22	#include "queue.h"	22	#include "queue.h"
23		23
24	q_c::q_c() throw (error_c) : generic_packetizer_c() {	24	q_c::q_c() : generic_packetizer_c() {
25	first = NULL;	25	first = NULL;
26	current = NULL;	26	current = NULL;
27	next_is_key = -1;	27	next_is_key = -1;

Lines 36-42 Link Here

(-)a/queue.h (-1 / +1 lines)
36	ogg_stream_state os;	36	ogg_stream_state os;
37		37
38	public:	38	public:
39	q_c() throw (error_c);	39	q_c();
40	virtual ~q_c();	40	virtual ~q_c();
41		41
42	virtual int add_ogg_page(ogg_page *, int header_page,	42	virtual int add_ogg_page(ogg_page *, int header_page,

Lines 55-61 Link Here

(-)a/r_ac3.cpp (-1 / +1 lines)
55	}	55	}
56		56
57	ac3_reader_c::ac3_reader_c(char fname, audio_sync_t nasync,	57	ac3_reader_c::ac3_reader_c(char fname, audio_sync_t nasync,
58	range_t nrange, char *ncomments) throw (error_c) {	58	range_t nrange, char *ncomments) {
59	int pos;	59	int pos;
60	ac3_header_t ac3header;	60	ac3_header_t ac3header;
61		61

Lines 36-42 Link Here

(-)a/r_ac3.h (-1 / +1 lines)
36		36
37	public:	37	public:
38	ac3_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	38	ac3_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
39	char **ncomments) throw (error_c);	39	char **ncomments);
40	virtual ~ac3_reader_c();	40	virtual ~ac3_reader_c();
41		41
42	virtual int read();	42	virtual int read();

Lines 55-61 Link Here

(-)a/r_avi.cpp (-1 / +1 lines)
55	avi_reader_c::avi_reader_c(char fname, unsigned char astreams,	55	avi_reader_c::avi_reader_c(char fname, unsigned char astreams,
56	unsigned char vstreams, audio_sync_t nasync,	56	unsigned char vstreams, audio_sync_t nasync,
57	range_t nrange, char ncomments, char nfourcc,	57	range_t nrange, char ncomments, char nfourcc,
58	char* nav_seek) throw (error_c) {	58	char* nav_seek) {
59	int fsize, i;	59	int fsize, i;
60	off_t size;	60	off_t size;
61	FILE *f;	61	FILE *f;

Lines 67-73 Link Here

(-)a/r_avi.h (-1 / +1 lines)
67	avi_reader_c(char fname, unsigned char astreams,	67	avi_reader_c(char fname, unsigned char astreams,
68	unsigned char vstreams, audio_sync_t nasync,	68	unsigned char vstreams, audio_sync_t nasync,
69	range_t nrange, char ncomments, char nfourcc,	69	range_t nrange, char ncomments, char nfourcc,
70	char* nav_seek) throw (error_c);	70	char* nav_seek);
71	virtual ~avi_reader_c();	71	virtual ~avi_reader_c();
72		72
73	virtual int read();	73	virtual int read();

Lines 56-62 Link Here

(-)a/r_microdvd.cpp (-1 / +1 lines)
56		56
57	microdvd_reader_c::microdvd_reader_c(char fname, audio_sync_t nasync,	57	microdvd_reader_c::microdvd_reader_c(char fname, audio_sync_t nasync,
58	range_t nrange, char *ncomments)	58	range_t nrange, char *ncomments)
59	throw (error_c) {	59	{
60	if ((file = fopen(fname, "r")) == NULL)	60	if ((file = fopen(fname, "r")) == NULL)
61	throw error_c("microdvd_reader: Could not open source file.");	61	throw error_c("microdvd_reader: Could not open source file.");
62	if (!microdvd_reader_c::probe_file(file, 0))	62	if (!microdvd_reader_c::probe_file(file, 0))

Lines 35-41 Link Here

(-)a/r_microdvd.h (-1 / +1 lines)
35		35
36	public:	36	public:
37	microdvd_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	37	microdvd_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
38	char **ncomments) throw (error_c);	38	char **ncomments);
39	virtual ~microdvd_reader_c();	39	virtual ~microdvd_reader_c();
40		40
41	virtual int read();	41	virtual int read();

Lines 60-66 Link Here

(-)a/r_mp3.cpp (-1 / +1 lines)
60	}	60	}
61		61
62	mp3_reader_c::mp3_reader_c(char fname, audio_sync_t nasync,	62	mp3_reader_c::mp3_reader_c(char fname, audio_sync_t nasync,
63	range_t nrange, char *ncomments) throw (error_c) {	63	range_t nrange, char *ncomments) {
64	int pos;	64	int pos;
65	unsigned long header;	65	unsigned long header;
66	mp3_header_t mp3header;	66	mp3_header_t mp3header;

Lines 40-46 Link Here

(-)a/r_mp3.h (-1 / +1 lines)
40		40
41	public:	41	public:
42	mp3_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	42	mp3_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
43	char **ncomments) throw (error_c);	43	char **ncomments);
44	virtual ~mp3_reader_c();	44	virtual ~mp3_reader_c();
45		45
46	virtual int read();	46	virtual int read();

Lines 60-66 Link Here

(-)a/r_ogm.cpp (-1 / +1 lines)
60	ogm_reader_c::ogm_reader_c(char fname, unsigned char astreams,	60	ogm_reader_c::ogm_reader_c(char fname, unsigned char astreams,
61	unsigned char vstreams, unsigned char tstreams,	61	unsigned char vstreams, unsigned char tstreams,
62	audio_sync_t nasync, range_t nrange,	62	audio_sync_t nasync, range_t nrange,
63	char *ncomments, char nfourcc) throw (error_c) {	63	char *ncomments, char nfourcc) {
64	off_t size;	64	off_t size;
65		65
66	if ((file = fopen(fname, "r")) == NULL)	66	if ((file = fopen(fname, "r")) == NULL)

Lines 62-68 Link Here

(-)a/r_ogm.h (-1 / +1 lines)
62	ogm_reader_c(char fname, unsigned char astreams,	62	ogm_reader_c(char fname, unsigned char astreams,
63	unsigned char vstreams, unsigned char tstreams,	63	unsigned char vstreams, unsigned char tstreams,
64	audio_sync_t nasync, range_t nrange, char **ncomments,	64	audio_sync_t nasync, range_t nrange, char **ncomments,
65	char *nfourcc) throw (error_c);	65	char *nfourcc);
66	virtual ~ogm_reader_c();	66	virtual ~ogm_reader_c();
67		67
68	virtual int read();	68	virtual int read();

Lines 62-68 Link Here

(-)a/r_srt.cpp (-1 / +1 lines)
62	}	62	}
63		63
64	srt_reader_c::srt_reader_c(char fname, audio_sync_t nasync,	64	srt_reader_c::srt_reader_c(char fname, audio_sync_t nasync,
65	range_t nrange, char *ncomments) throw (error_c) {	65	range_t nrange, char *ncomments) {
66	if ((file = fopen(fname, "r")) == NULL)	66	if ((file = fopen(fname, "r")) == NULL)
67	throw error_c("srt_reader: Could not open source file.");	67	throw error_c("srt_reader: Could not open source file.");
68	if (!srt_reader_c::probe_file(file, 0))	68	if (!srt_reader_c::probe_file(file, 0))

Lines 35-41 Link Here

(-)a/r_srt.h (-1 / +1 lines)
35		35
36	public:	36	public:
37	srt_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	37	srt_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
38	char **ncomments) throw (error_c);	38	char **ncomments);
39	virtual ~srt_reader_c();	39	virtual ~srt_reader_c();
40		40
41	virtual int read();	41	virtual int read();

Lines 72-78 Link Here

(-)a/r_vobsub.cpp (-1 / +1 lines)
72		72
73	vobsub_reader_c::vobsub_reader_c(char fname, audio_sync_t nasync,	73	vobsub_reader_c::vobsub_reader_c(char fname, audio_sync_t nasync,
74	range_t nrange, char *ncomments)	74	range_t nrange, char *ncomments)
75	throw (error_c) {	75	{
76	char *name;	76	char *name;
77		77
78	if ((file = fopen(fname, "r")) == NULL)	78	if ((file = fopen(fname, "r")) == NULL)

Lines 42-48 Link Here

(-)a/r_vobsub.h (-1 / +1 lines)
42		42
43	public:	43	public:
44	vobsub_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	44	vobsub_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
45	char **ncomments) throw (error_c);	45	char **ncomments);
46	virtual ~vobsub_reader_c();	46	virtual ~vobsub_reader_c();
47		47
48	virtual int read();	48	virtual int read();

Lines 50-56 Link Here

(-)a/r_wav.cpp (-1 / +1 lines)
50	}	50	}
51		51
52	wav_reader_c::wav_reader_c(char fname, audio_sync_t nasync,	52	wav_reader_c::wav_reader_c(char fname, audio_sync_t nasync,
53	range_t nrange, char *ncomments) throw (error_c) {	53	range_t nrange, char *ncomments) {
54	uint64_t size;	54	uint64_t size;
55	uint32_t samplerate;	55	uint32_t samplerate;
56	uint16_t channels, bitdepth;	56	uint16_t channels, bitdepth;

Lines 41-47 Link Here

(-)a/r_wav.h (-1 / +1 lines)
41		41
42	public:	42	public:
43	wav_reader_c(char fname, audio_sync_t nasync, range_t *nrange,	43	wav_reader_c(char fname, audio_sync_t nasync, range_t *nrange,
44	char **ncomments) throw (error_c);	44	char **ncomments);
45	virtual ~wav_reader_c();	45	virtual ~wav_reader_c();
46		46
47	virtual int read();	47	virtual int read();

Return to bug 786543