summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2014-05-23 09:38:25 (GMT)
committerStefan Radomski <github@mintwerk.de>2014-05-23 09:38:25 (GMT)
commit216e8efb0f1aff9afd3881ab89b49e017e255228 (patch)
treee7ba7ae98beb5823fd9a9393a6c40687f00d4760
parent395eb4c107d01b8e7d0bb73feec2a693a97d8b61 (diff)
parent4952aada04cbd5c05d6054c74b6ded4d2771defc (diff)
downloaduscxml-216e8efb0f1aff9afd3881ab89b49e017e255228.zip
uscxml-216e8efb0f1aff9afd3881ab89b49e017e255228.tar.gz
uscxml-216e8efb0f1aff9afd3881ab89b49e017e255228.tar.bz2
Merge pull request #34 from mathiasjohanson/master
input format for video encoder set to default value
-rw-r--r--src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
index 72ac06c..2dd05f2 100644
--- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
+++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
@@ -729,6 +729,7 @@ int MilesSessionInvoker::setup_video_grabber() {
}
}
grabber_description = miles_video_grabber_get_description(supported_video_grabbers[use_grabber]);
+ printf("Using video grabber %s\n", grabber_description->name);
video_grabber = miles_video_grabber_create_context(supported_video_grabbers[use_grabber]);
video_grabber->width = 320;
video_grabber->height = 240;
@@ -749,7 +750,7 @@ int MilesSessionInvoker::setup_video_grabber() {
video_encoder->width = video_grabber->width = 320;
video_encoder->height = video_grabber->height = 240;
video_encoder->qfactor = 50;
- video_encoder->input_format = video_grabber->image_format;
+ //video_encoder->input_format = MILES_IMAGE_RGB; //video_grabber->image_format;
int rv = miles_video_codec_setup_encoder(video_encoder);
if (!rv) {
LOG(ERROR) << "Could not setup video encoder";