[oggvideotools] 01/01: Updated build rules for new 0.9 version.
Petter Reinholdtsen
pere at moszumanska.debian.org
Tue May 24 09:40:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
pere pushed a commit to branch master
in repository oggvideotools.
commit 1802c0974c6f60c89f52989b5b5016ac08836b5b
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Tue May 24 09:39:37 2016 +0000
Updated build rules for new 0.9 version.
---
debian/oggvideotools.install | 2 +-
debian/patches/init-for-valgrind.patch | 19 ++
debian/patches/manual-typos.patch | 76 +++++--
debian/patches/mayhem-crash-oggjoin.patch | 22 +-
debian/patches/more-compiler-warnings.patch | 14 +-
debian/patches/oggThumb-zero-getopt-long.patch | 20 +-
debian/patches/series | 2 +-
debian/patches/version-0.8a-1.patch | 140 ------------
src/base/oggPacket.cpp.orig | 281 -------------------------
9 files changed, 107 insertions(+), 469 deletions(-)
diff --git a/debian/oggvideotools.install b/debian/oggvideotools.install
index 9bc3cbf..ddc9618 100644
--- a/debian/oggvideotools.install
+++ b/debian/oggvideotools.install
@@ -1,2 +1,2 @@
-obj-*/src/ogg* usr/bin
+obj-*/src/binaries/ogg* usr/bin
scripts/mkThumbs usr/bin
diff --git a/debian/patches/init-for-valgrind.patch b/debian/patches/init-for-valgrind.patch
new file mode 100644
index 0000000..07e52b7
--- /dev/null
+++ b/debian/patches/init-for-valgrind.patch
@@ -0,0 +1,19 @@
+Description: Initialize TheoraStreamParameter::colorspace.
+ Avoid warning from valgrind about making decisions based on uninitialized
+ values by making sure to initialize TheoraStreamParameter::colorspace to
+ unspecified when creating a new object.
+Author: Petter Reinholdtsen <pere at hungry.com>
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-05-24
+
+--- oggvideotools-0.9.orig/src/ovt_theora/theoraStreamParameter.cpp
++++ oggvideotools-0.9/src/ovt_theora/theoraStreamParameter.cpp
+@@ -5,6 +5,7 @@
+ #include "log.h"
+
+ TheoraStreamParameter::TheoraStreamParameter()
++ : colorspace(unspecified)
+ {
+ }
+
diff --git a/debian/patches/manual-typos.patch b/debian/patches/manual-typos.patch
index 57e2ee5..0a4aad3 100644
--- a/debian/patches/manual-typos.patch
+++ b/debian/patches/manual-typos.patch
@@ -5,8 +5,8 @@ Last-Update: 2014-10-22
Index: oggvideotools/docs/oggDump.1
===================================================================
---- oggvideotools.orig/docs/oggDump.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggDump.1 2014-10-22 12:34:49.939724056 +0200
+--- oggvideotools.orig/docs/oggDump.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggDump.1 2016-05-24 09:32:05.562912790 +0000
@@ -7,9 +7,9 @@
.B OggDump
gives detailed information about an ogg video file and prints these information with a given detail level.
@@ -21,8 +21,8 @@ Index: oggvideotools/docs/oggDump.1
.IP \-g
Index: oggvideotools/docs/oggSlideshow.1
===================================================================
---- oggvideotools.orig/docs/oggSlideshow.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggSlideshow.1 2014-10-22 12:34:36.127612865 +0200
+--- oggvideotools.orig/docs/oggSlideshow.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggSlideshow.1 2016-05-24 09:32:05.562912790 +0000
@@ -52,7 +52,7 @@
.I Example: \-t p
@@ -34,8 +34,8 @@ Index: oggvideotools/docs/oggSlideshow.1
Index: oggvideotools/docs/oggTranscode.1
===================================================================
---- oggvideotools.orig/docs/oggTranscode.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggTranscode.1 2014-10-22 12:34:36.127612865 +0200
+--- oggvideotools.orig/docs/oggTranscode.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggTranscode.1 2016-05-24 09:32:05.562912790 +0000
@@ -57,7 +57,7 @@
Adds comments to the video (theora) stream. Comments are given by a pair
of type and value in the form 'type=value'. More than one comment can be
@@ -56,8 +56,8 @@ Index: oggvideotools/docs/oggTranscode.1
Index: oggvideotools/docs/oggCat.1
===================================================================
---- oggvideotools.orig/docs/oggCat.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggCat.1 2014-10-22 12:34:36.127612865 +0200
+--- oggvideotools.orig/docs/oggCat.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggCat.1 2016-05-24 09:32:05.562912790 +0000
@@ -53,7 +53,7 @@
Adds comments to the video (theora) stream. Comments are given by a pair
of type and value in the form 'type=value'. More than one comment can be
@@ -85,35 +85,62 @@ Index: oggvideotools/docs/oggCat.1
.IP \-x
Force to overwrite the output file, even if it exists. This is mainly helpful if the oggCat is server controlled.
+Index: oggvideotools/docs/oggThumb.html
+===================================================================
+--- oggvideotools.orig/docs/oggThumb.html 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggThumb.html 2016-05-24 09:32:05.562912790 +0000
+@@ -35,13 +35,13 @@
+
+ <DL COMPACT>
+ <DT>-t<DD>
+-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
++Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+ <P>
+ <I>Example: -t 12.4,14.157,13.23</I>
+
+ <P>
+ <DT>-f<DD>
+-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
++Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+ <P>
+ <I>Example: -f 12000,13000,11000</I>
+
Index: oggvideotools/docs/oggThumb.1
===================================================================
---- oggvideotools.orig/docs/oggThumb.1 2014-10-22 12:34:36.091612578 +0200
-+++ oggvideotools/docs/oggThumb.1 2014-10-22 12:34:36.127612865 +0200
+--- oggvideotools.orig/docs/oggThumb.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggThumb.1 2016-05-24 09:32:05.562912790 +0000
@@ -11,16 +11,16 @@
.I <filename_without_extension>_x.<picture_extension>
-Where x starts with 0 and is incremented with every created thumbnail. So the thumbnails are successivly numbered by the appearence order. This is even valid, if time positions and frame numbers are mixed.
-+Where x starts with 0 and is incremented with every created thumbnail. So the thumbnails are successivly numbered by the appearance order. This is even valid, if time positions and frame numbers are mixed.
++Where x starts with 0 and is incremented with every created thumbnail. So the thumbnails are successively numbered by the appearance order. This is even valid, if time positions and frame numbers are mixed.
.SH OPTIONS
.IP -t
--Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
-+Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
++Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
.I Example: \-t 12.4,14.157,13.23
.IP -f
--Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
-+Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
++Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
.I Example: \-f 12000,13000,11000
+@@ -58,4 +58,4 @@
+ .BR oggSplit (1),
+ .BR oggTranscode (1),
+ .BR oggSlideshow (1),
+-.BR oggSilence (1)
+\ No newline at end of file
++.BR oggSilence (1)
Index: oggvideotools/docs/oggCut.1
===================================================================
---- oggvideotools.orig/docs/oggCut.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggCut.1 2014-10-22 12:34:36.127612865 +0200
-@@ -36,7 +36,7 @@
+--- oggvideotools.orig/docs/oggCut.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggCut.1 2016-05-24 09:33:13.831477966 +0000
+@@ -36,13 +36,15 @@
.I Example: \-l 10000
.IP \-e
@@ -122,10 +149,19 @@ Index: oggvideotools/docs/oggCut.1
Default: \-1
+ .I Example: \-e 20000
+
+-.IP \-i \-o
++.IP \-i
++
++.IP \-o
+ Input file and output file set (alternative).
+ These parameters can be used alternatively. They are overwritten by the arguments after the options. If there is one argument given, it is used as the input file (and overwrites a file given with -i). If there are two arguments, the input and output files from the -i and -o option values are overwritten.
+
Index: oggvideotools/docs/oggSplit.1
===================================================================
---- oggvideotools.orig/docs/oggSplit.1 2014-10-22 12:30:40.121711763 +0200
-+++ oggvideotools/docs/oggSplit.1 2014-10-22 12:34:36.127612865 +0200
+--- oggvideotools.orig/docs/oggSplit.1 2016-05-24 09:32:05.566912824 +0000
++++ oggvideotools/docs/oggSplit.1 2016-05-24 09:32:05.562912790 +0000
@@ -7,7 +7,7 @@
.B oggSplit
demultiplexes a multiplexed ogg file into several files with one stream each.
diff --git a/debian/patches/mayhem-crash-oggjoin.patch b/debian/patches/mayhem-crash-oggjoin.patch
index 4c602f4..53ed086 100644
--- a/debian/patches/mayhem-crash-oggjoin.patch
+++ b/debian/patches/mayhem-crash-oggjoin.patch
@@ -5,25 +5,27 @@ Forwarded: no
Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
Last-Update: 2014-10-22
---- oggvideotools-0.8a.orig/src/oggBOSExtractorFactory.cpp
-+++ oggvideotools-0.8a/src/oggBOSExtractorFactory.cpp
-@@ -116,6 +116,9 @@ OggType OggBOSExtractorFactory::getStrea
+diff --git a/src/main/oggBOSExtractorFactory.cpp b/src/main/oggBOSExtractorFactory.cpp
+index 8bee556..7929e8e 100644
+--- a/src/main/oggBOSExtractorFactory.cpp
++++ b/src/main/oggBOSExtractorFactory.cpp
+@@ -116,6 +116,9 @@ OggType OggBOSExtractorFactory::getStreamType(OggPage& page)
{
- uint8* type = page.obj()->data+page.obj()->headerLength;
+ uint8* type = &(page->data())[0]+page->getHeaderLength();
+ if (NULL == OggTypeMap || NULL == type)
-+ return (ogg_unknown);
++ return (OggType::unknown);
+
uint8 i=1;
- for (; i< ogg_maxOggType; ++i) {
+ for (; i< to_integral(OggType::maxOggType); ++i) {
if (memcmp(type, OggTypeMap[i], MAXIDCHARS) == 0)
-@@ -131,6 +134,9 @@ OggType OggBOSExtractorFactory::getStrea
+@@ -131,6 +134,9 @@ OggType OggBOSExtractorFactory::getStreamType(OggPacket& packet)
{
- uint8* type = packet.data();
+ uint8* type = packet->data();
+ if (NULL == OggTypeMap || NULL == type)
-+ return (ogg_unknown);
++ return (OggType::unknown);
+
uint8 i=1;
- for (; i< ogg_maxOggType; ++i) {
+ for (; i< to_integral(OggType::maxOggType); ++i) {
if (memcmp(type, OggTypeMap[i], MAXIDCHARS) == 0)
diff --git a/debian/patches/more-compiler-warnings.patch b/debian/patches/more-compiler-warnings.patch
index 25acf17..0f3e22e 100644
--- a/debian/patches/more-compiler-warnings.patch
+++ b/debian/patches/more-compiler-warnings.patch
@@ -7,14 +7,14 @@ Last-Update: 2015-09-23
Index: oggvideotools/CMakeLists.txt
===================================================================
---- oggvideotools.orig/CMakeLists.txt 2015-09-23 20:23:37.727537878 +0000
-+++ oggvideotools/CMakeLists.txt 2015-09-23 20:23:34.071519635 +0000
+--- oggvideotools.orig/CMakeLists.txt 2016-05-24 10:47:34.764474837 +0200
++++ oggvideotools/CMakeLists.txt 2016-05-24 10:47:53.552633949 +0200
@@ -124,6 +124,8 @@
- ADD_DEFINITIONS ( -D_FILE_OFFSET_BITS=64 )
+ ADD_DEFINITIONS ( -D_FILE_OFFSET_BITS=64 -Wno-write-strings )
#ADD_DEFINITIONS ( -DDEBUG )
- #ADD_DEFINITIONS ( -O0 -g )
+ ADD_DEFINITIONS ( -O0 -g --std=c++0x -fPIC )
+ADD_DEFINITIONS ( -Wall -Wextra )
+#ADD_DEFINITIONS ( -Werror )
-
- INCLUDE_DIRECTORIES ( ${CMAKE_BINARY_DIR} )
-
+ IF ( HAVE_LIBGD )
+ ADD_DEFINITIONS ( -DWITH_GD2LIB )
+ ENDIF (HAVE_LIBGD )
diff --git a/debian/patches/oggThumb-zero-getopt-long.patch b/debian/patches/oggThumb-zero-getopt-long.patch
index b8bb971..c3660a7 100644
--- a/debian/patches/oggThumb-zero-getopt-long.patch
+++ b/debian/patches/oggThumb-zero-getopt-long.patch
@@ -8,15 +8,17 @@ Forwarded: no
Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
Last-Update: 2014-10-22
---- oggvideotools-0.8a.orig/src/oggThumb.cpp
-+++ oggvideotools-0.8a/src/oggThumb.cpp
-@@ -260,7 +260,8 @@ NULL, val:
- {name: "verbose"
- , has_arg: 1, flag:
- NULL, val:
-- opt_verbose}
-+ opt_verbose},
-+{0},
+Index: oggvideotools/src/binaries/oggThumb.cpp
+===================================================================
+--- oggvideotools.orig/src/binaries/oggThumb.cpp 2016-05-24 10:38:11.515726684 +0200
++++ oggvideotools/src/binaries/oggThumb.cpp 2016-05-24 10:38:27.603862021 +0200
+@@ -262,7 +262,8 @@
+ /* has_arg: */ 1,
+ /* flag: */ NULL,
+ /* val: */ opt_verbose
+- }
++ },
++ {0},
};
//#endif
diff --git a/debian/patches/series b/debian/patches/series
index 083d49b..37af4c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-version-0.8a-1.patch
mayhem-crash-oggjoin.patch
manual-typos.patch
oggThumb-zero-getopt-long.patch
more-compiler-warnings.patch
+init-for-valgrind.patch
diff --git a/debian/patches/version-0.8a-1.patch b/debian/patches/version-0.8a-1.patch
deleted file mode 100644
index 4c6ae08..0000000
--- a/debian/patches/version-0.8a-1.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Description: changes foudn in version 0.8a-1
-Author: ?
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- oggvideotools-0.8a.orig/src/oggCat.cpp
-+++ oggvideotools-0.8a/src/oggCat.cpp
-@@ -32,6 +32,7 @@
-
- #include <cstdlib>
- #include <ctime>
-+#include <unistd.h>
-
- #include "definition.h"
- #include "helper.h"
---- oggvideotools-0.8a.orig/src/CMakeLists.txt
-+++ oggvideotools-0.8a/src/CMakeLists.txt
-@@ -123,7 +123,8 @@ INCLUDE_DIRECTORIES ( ${THEORADEC_INCLUD
- IF ( $ENV{MAKE_PACKAGE} )
- ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
- ELSE ( $ENV{MAKE_PACKAGE} )
-- ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
-+ ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
-+# ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
- ENDIF ( $ENV{MAKE_PACKAGE} )
- TARGET_LINK_LIBRARIES ( oggvideotools ${ALL_LIBS})
-
---- oggvideotools-0.8a.orig/src/oggDump.cpp
-+++ oggvideotools-0.8a/src/oggDump.cpp
-@@ -31,6 +31,7 @@
- #include <fstream>
- #include <ostream>
- #include <cstdlib>
-+#include <unistd.h>
-
- #include "fileRepository.h"
- #include "rawMediaPacket.h"
---- oggvideotools-0.8a.orig/src/oggLength.cpp
-+++ oggvideotools-0.8a/src/oggLength.cpp
-@@ -27,6 +27,7 @@
- #include <iostream>
- #include <string>
- #include <cstdlib>
-+#include <unistd.h>
-
- #include "fileRepository.h"
- #include "streamSerializer.h"
---- oggvideotools-0.8a.orig/src/oggSilence.cpp
-+++ oggvideotools-0.8a/src/oggSilence.cpp
-@@ -30,6 +30,7 @@
- #include <sstream>
- #include <cstdlib>
- #include <ctime>
-+#include <unistd.h>
-
- #include "vorbisEncoder.h"
- #include "streamMux.h"
---- oggvideotools-0.8a.orig/src/oggSlideshow.cpp
-+++ oggvideotools-0.8a/src/oggSlideshow.cpp
-@@ -36,6 +36,7 @@
- #include <cstring>
- #include <ctime>
- #include <exception>
-+#include <unistd.h>
-
- #include "th_helper.h"
-
---- oggvideotools-0.8a.orig/src/oggCut.cpp
-+++ oggvideotools-0.8a/src/oggCut.cpp
-@@ -29,6 +29,7 @@
- #include <map>
- #include <cstdlib>
- #include <ctime>
-+#include <unistd.h>
-
- #include "fileRepository.h"
- #include "streamSerializer.h"
---- oggvideotools-0.8a.orig/src/oggTranscode.cpp
-+++ oggvideotools-0.8a/src/oggTranscode.cpp
-@@ -34,6 +34,7 @@
- #include <cstdlib>
- #include <cmath>
- #include <ctime>
-+#include <unistd.h>
-
- #ifdef HAVE_CONFIG_H
- #include "config.h"
---- oggvideotools-0.8a.orig/docs/oggThumb.html
-+++ oggvideotools-0.8a/docs/oggThumb.html
-@@ -35,13 +35,13 @@ Where x starts with 0 and is incremented
-
- <DL COMPACT>
- <DT>-t<DD>
--Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
-+Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
- <P>
- <I>Example: -t 12.4,14.157,13.23</I>
-
- <P>
- <DT>-f<DD>
--Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
-+Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
- <P>
- <I>Example: -f 12000,13000,11000</I>
-
---- oggvideotools-0.8a.orig/docs/oggThumb.1
-+++ oggvideotools-0.8a/docs/oggThumb.1
-@@ -15,12 +15,12 @@ Where x starts with 0 and is incremented
-
- .SH OPTIONS
- .IP -t
--Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
-+Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
-
- .I Example: \-t 12.4,14.157,13.23
-
- .IP -f
--Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
-+Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
-
- .I Example: \-f 12000,13000,11000
-
-@@ -58,4 +58,4 @@ Joern Seger <yorn at gmx dot net>
- .BR oggSplit (1),
- .BR oggTranscode (1),
- .BR oggSlideshow (1),
--.BR oggSilence (1)
-\ No newline at end of file
-+.BR oggSilence (1)
diff --git a/src/base/oggPacket.cpp.orig b/src/base/oggPacket.cpp.orig
deleted file mode 100644
index 75f1f57..0000000
--- a/src/base/oggPacket.cpp.orig
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * OggPacket will carry all relevant information of an ogg packet
- *
- * Copyright (C) 2008 Joern Seger
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <iostream>
-#include <sstream>
-#include <cstring>
-
-#include "oggPacket.h"
-#include "log.h"
-
-OggPacketInternal::OggPacketInternal()
- : oggPacket {/*packet*/0,/*bytes*/0, /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/-1, /*packetno*/0},
-streamType(OggType::unknown), streamNo(255), streamHeader(false)
-{
-}
-
-OggPacketInternal::OggPacketInternal(uint8* data, uint32 length,
- uint32 packetNo, int64 granulePos, PacketType packetType)
- : oggPacket {/*packet*/data,/*bytes*/length, /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/granulePos, /*packetno*/packetNo},
-streamType(OggType::unknown), streamNo(255), streamHeader(false)
-{
- switch (packetType) {
- case PacketType::bos:
- oggPacket.b_o_s = 256;
- break;
- case PacketType::eos:
- oggPacket.e_o_s = 256;
- break;
- default:
- {}
- }
-
-}
-
-OggPacket OggPacketInternal::clone()
-{
- /* a bit nasty, as ogg_packet is c */
- uint8* data = new uint8[oggPacket.bytes];
- memcpy(data, oggPacket.packet, oggPacket.bytes);
-
- PacketType packetType(PacketType::normal);
-
- if (oggPacket.b_o_s)
- packetType = PacketType::bos;
-
- if (oggPacket.e_o_s)
- packetType = PacketType::eos;
-
- OggPacket pkt = std::make_shared<OggPacketInternal>(data, oggPacket.bytes, oggPacket.packetno, oggPacket.granulepos, packetType);
-
- pkt->streamNo = streamNo;
- pkt->streamType = streamType;
- pkt->streamHeader = streamHeader;
-
- return pkt;
-}
-
-OggPacket OggPacketInternal::getPtr()
-{
- return shared_from_this();
-}
-
-OggPacket OggPacketInternal::create(uint8 *data, uint32 length, uint32 packetNo, int64 granulePos, OggPacketInternal::PacketType packetType)
-{
- return std::make_shared<OggPacketInternal>(data, length, packetNo, granulePos, packetType);
-
-}
-
-
-OggPacketInternal::~OggPacketInternal()
-{
- delete[] oggPacket.packet;
-}
-
-
-int64 OggPacketInternal::granulepos()
-{
- return oggPacket.granulepos;
-}
-
-void OggPacketInternal::setGranulepos(int64 pos)
-{
- oggPacket.granulepos = pos;
-}
-
-void OggPacketInternal::setStreamHeader()
-{
- streamHeader = true;
-}
-
-bool OggPacketInternal::isStreamHeader()
-{
- return streamHeader;
-}
-
-uint32 OggPacketInternal::getPacketNo()
-{
- return oggPacket.packetno;
-}
-
-uint32 OggPacketInternal::length()
-{
- return oggPacket.bytes;
-}
-
-bool OggPacketInternal::isBOS()
-{
- return oggPacket.b_o_s;
-}
-
-bool OggPacketInternal::isEOS()
-{
- return oggPacket.e_o_s;
-}
-
-void OggPacketInternal::setBOS()
-{
- oggPacket.b_o_s = 1;
-}
-
-void OggPacketInternal::setEOS()
-{
- oggPacket.e_o_s = 1;
-}
-
-void OggPacketInternal::unsetBOS()
-{
- oggPacket.b_o_s = 0;
-}
-
-void OggPacketInternal::unsetEOS()
-{
- oggPacket.e_o_s = 0;
-}
-
-/*
-ogg_packet OggPacketInternal::toLibogg()
-{
- return(*objPtr);
-}
-*/
-uint8 OggPacketInternal::getStreamNo()
-{
- return streamNo;
-}
-
-OggType OggPacketInternal::getStreamType()
-{
- return streamType;
-}
-
-void OggPacketInternal::setStreamNo(int8 no)
-{
- streamNo = no;
-}
-
-void OggPacketInternal::setStreamType(OggType type)
-{
- streamType = type;
-}
-
-/*
-void OggPacketInternal::fromLibogg(ogg_packet pack)
-{
- // copy all information including the pointers
- bytes = pack.bytes;
- packetno = pack.packetno;
- granulepos = pack.granulepos;
- b_o_s = pack.b_o_s;
- e_o_s = pack.e_o_s;
-
- packet = new uint8[pack.bytes];
-
- if (packet) {
- memcpy(packet, pack.packet, pack.bytes);
- }
- else {
- logger.error() << "OggPacketInternal::fromLibogg: out of memory\n";
- }
-}
-*/
-
-uint8* OggPacketInternal::data()
-{
- return oggPacket.packet;
-}
-
-/* print levels:
- * 1) only data length information
- * 2) header information
- * 3) additional header information
- * 4) header dump
- * 5) body dump
- */
-std::string OggPacketInternal::print(uint8 level)
-{
- std::stringstream retStream;
-
- retStream << "\nOgg Packet: packet length = " << oggPacket.bytes << std::endl;
-
- if (level < 1)
- return(retStream.str());
-
- retStream << "\nHeader Information:"
- << "\n\tBegin of Stream : ";
-
- if (oggPacket.b_o_s)
- retStream << "true";
- else
- retStream << "false";
-
- retStream << "\n\tEnd of Stream : ";
-
- if (oggPacket.e_o_s)
- retStream << "true";
- else
- retStream << "false";
-
- retStream << "\n\tGranule Position : " << oggPacket.granulepos;
- retStream << "\n\tPacket Number : " << oggPacket.packetno;
-
- retStream << std::endl;
-
- if (level < 3)
- return(retStream.str());
-
- retStream << "\n\tStream Number : " << (int)streamNo;
- retStream << "\n\tStream Type : ";
-
- switch (streamType) {
- case OggType::vorbis:
- retStream << "Vorbis";
- break;
- case OggType::theora:
- retStream << "Theora";
- break;
- case OggType::kate:
- retStream << "Kate";
- break;
- case OggType::unknown:
- default:
- retStream << "unknown";
- break;
- }
- retStream << std::endl;
-
- if (level < 4)
- return(retStream.str());
-
- retStream << "\nPacket Hex dump:" << std::hex;
-
- for (int32 c(0); c<oggPacket.bytes; ++c) {
- if ((c%16) == 0)
- retStream << std::endl;
- if (((unsigned) (oggPacket.packet[c])) < 16)
- retStream << "0";
- retStream << (unsigned) (oggPacket.packet[c]);
- }
-
- retStream << std::dec << std::endl;
-
- return(retStream.str());
-}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/oggvideotools.git
More information about the pkg-xiph-commits
mailing list