summaryrefslogtreecommitdiff
path: root/src/libfame_wrapper.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 15:05:57 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 15:05:57 +0200
commit0332e496347f6b563abb86d4ef9650bbd6ebc3e1 (patch)
tree74dadbe6e4f3216c8a3c8570e203aad0187febf3 /src/libfame_wrapper.cc
parent8eb0759e2e8a5405b2dd9e6d72d3bd620b51bee4 (diff)
Port server to hugin.
Diffstat (limited to 'src/libfame_wrapper.cc')
-rw-r--r--src/libfame_wrapper.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/libfame_wrapper.cc b/src/libfame_wrapper.cc
index f2e9adb..e4cb4c5 100644
--- a/src/libfame_wrapper.cc
+++ b/src/libfame_wrapper.cc
@@ -24,19 +24,18 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
#include "libfame_wrapper.h"
#include <errno.h>
#include <string.h>
+#include <hugin.hpp>
+
#include "miav_config.h"
#include "frame.h"
-LibFAMEWrapper::LibFAMEWrapper(Info *i)
+LibFAMEWrapper::LibFAMEWrapper()
{
- info = i;
-
// FIXME: Hmmm... should this be detected somewhere?!
int w = 720;
int h = 576;
@@ -66,7 +65,8 @@ LibFAMEWrapper::LibFAMEWrapper(Info *i)
// can then be used for subsequent library calls.)
fame_context = fame_open();
if(!fame_context) {
- info->error("Unable to open FAME context, due to the following error: %s", strerror(errno));
+ ERR(fame, "Unable to open FAME context, due to the following error: %s",
+ strerror(errno));
return;
}
@@ -136,7 +136,7 @@ LibFAMEWrapper::LibFAMEWrapper(Info *i)
if(strcmp(config->readString("encoding_codec")->c_str(), "mpeg4") == 0) {
- info->info("Using mpeg4 compression.");
+ INFO(fame, "Using mpeg4 compression.");
fame_object_t *object;
object = fame_get_object(fame_context, "profile/mpeg4/simple");
@@ -144,7 +144,7 @@ LibFAMEWrapper::LibFAMEWrapper(Info *i)
} else if(strcmp(config->readString("encoding_codec")->c_str(), "mpeg1") == 0) {
- info->info("Using mpeg1 compression.");
+ INFO(fame, "Using mpeg1 compression.");
fame_object_t *object;
object = fame_get_object(fame_context, "profile/mpeg1");
@@ -152,7 +152,7 @@ LibFAMEWrapper::LibFAMEWrapper(Info *i)
} else if(strcmp(config->readString("encoding_codec")->c_str(), "mpeg1") == 0) {
} else {
- info->info("Using default (mpeg1) compression.");
+ INFO(fame, "Using default (mpeg1) compression.");
}
fame_init(fame_context, &fame_par, fame_buffer, FAME_BUFFER_SIZE);
@@ -254,13 +254,13 @@ Frame *LibFAMEWrapper::encode(Frame *dvframe)
// fame_end_frame(fame_context, &stats);
/*
- info->info("frame_number: %d, coding: %c, target_bits: %d, actual_bits: %d, spatial_activity: %d, quant_scale: %f",
- stats.frame_number,
- stats.coding,
- stats.target_bits,
- stats.actual_bits,
- stats.spatial_activity,
- stats.quant_scale);
+ DEBUG(fame "frame_number: %d, coding: %c, target_bits: %d, actual_bits: %d, spatial_activity: %d, quant_scale: %f",
+ stats.frame_number,
+ stats.coding,
+ stats.target_bits,
+ stats.actual_bits,
+ stats.spatial_activity,
+ stats.quant_scale);
*/
/*
fame_frame_statistics_t_ {