Merge lp:~schwann/qtubuntu-camera/video-orientation-support into lp:qtubuntu-camera

[Günter Schwann]

Support orientation for videos

Support orientation for videos

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/32/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Code looks good, ready to be approved after someone is able to test/verify the functionality.

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2013-06-05 16:11:12 +0000
+++ src/aalimagecapturecontrol.cpp	2013-06-18 12:20:22 +0000
@@ -87,11 +87,7 @@
         return m_lastRequestId;
     }
 
-    int rotation = m_service->metadataWriterControl()->orientation();
-    rotation = rotation % 360;
-    // the front camera rotates the other way round
-    if (!m_service->isBackCameraUsed())
-        rotation = (360 - rotation) % 360;
+    int rotation = m_service->metadataWriterControl()->correctedOrientation();
     android_camera_set_rotation(m_service->androidControl(), rotation);
 
     android_camera_take_snapshot(m_service->androidControl());
@@ -100,6 +96,8 @@
 
     m_service->videoOutputControl()->createPreview();
 
+    m_service->metadataWriterControl()->clearAllMetaData();
+
     return m_lastRequestId;
 }
 

=== modified file 'src/aalmediarecordercontrol.cpp'
--- src/aalmediarecordercontrol.cpp	2013-06-07 09:34:25 +0000
+++ src/aalmediarecordercontrol.cpp	2013-06-18 12:20:22 +0000
@@ -14,8 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "aalmediarecordercontrol.h"
 #include "aalcameraservice.h"
-#include "aalmediarecordercontrol.h"
+#include "aalmetadatawritercontrol.h"
 #include "storagemanager.h"
 
 #include <QDebug>
@@ -35,6 +36,13 @@
 
 const int AalMediaRecorderControl::DURATION_UPDATE_INTERVALL;
 
+const QLatin1String AalMediaRecorderControl::PARAM_AUDIO_BITRATE = QLatin1String("audio-param-encoding-bitrate");
+const QLatin1String AalMediaRecorderControl::PARAM_AUDIO_CHANNELS = QLatin1String("audio-param-number-of-channels");
+const QLatin1String AalMediaRecorderControl::PARAM_AUTIO_SAMPLING = QLatin1String("audio-param-sampling-rate");
+const QLatin1String AalMediaRecorderControl::PARAM_LATITUDE = QLatin1String("param-geotag-latitude");
+const QLatin1String AalMediaRecorderControl::PARAM_LONGITUDE = QLatin1String("param-geotag-longitude");
+const QLatin1String AalMediaRecorderControl::PARAM_ORIENTATION = QLatin1String("video-param-rotation-angle-degrees");
+const QLatin1String AalMediaRecorderControl::PARAM_VIDEO_BITRATE = QLatin1String("video-param-encoding-bitrate");
 /*!
  * \brief AalMediaRecorderControl::AalMediaRecorderControl
  * \param service
@@ -353,9 +361,15 @@
     }
 
     // FIXME the quality parameters should be checked from the MediaProfiles
-    QString parameters;
-    parameters.append("video-param-encoding-bitrate=6000000");
-    android_recorder_setParameters(m_mediaRecorder, parameters.toLocal8Bit().data());
+    setParameter(PARAM_VIDEO_BITRATE, 6000000);
+    setParameter(PARAM_AUDIO_BITRATE, 48000);
+    setParameter(PARAM_AUDIO_CHANNELS, 2);
+    setParameter(PARAM_AUTIO_SAMPLING, 96000);
+    if (m_service->metadataWriterControl()) {
+        int rotation = m_service->metadataWriterControl()->correctedOrientation();
+        setParameter(PARAM_ORIENTATION, rotation);
+        m_service->metadataWriterControl()->clearAllMetaData();
+    }
 
     ret = android_recorder_prepare(m_mediaRecorder);
     if (ret < 0) {
@@ -405,3 +419,15 @@
 
     deleteRecorder();
 }
+
+/*!
+ * \brief AalMediaRecorderControl::setParameter convenient function to set parameters
+ * \param parameter Name of the parameter
+ * \param value value to set
+ */
+void AalMediaRecorderControl::setParameter(const QString &parameter, int value)
+{
+    Q_ASSERT(m_mediaRecorder);
+    QString param =  parameter + QChar('=') + QString::number(value);
+    android_recorder_setParameters(m_mediaRecorder, param.toLocal8Bit().data());
+}

=== modified file 'src/aalmediarecordercontrol.h'
--- src/aalmediarecordercontrol.h	2013-06-03 07:44:43 +0000
+++ src/aalmediarecordercontrol.h	2013-06-18 12:20:22 +0000
@@ -17,6 +17,7 @@
 #ifndef AALMEDIARECORDERCONTROL_H
 #define AALMEDIARECORDERCONTROL_H
 
+#include <QLatin1String>
 #include <QMediaRecorderControl>
 #include <QUrl>
 
@@ -60,6 +61,7 @@
     void setStatus(QMediaRecorder::Status status);
     int startRecording();
     void stopRecording();
+    void setParameter(const QString &parameter, int value);
 
     AalCameraService *m_service;
     MediaRecorderWrapper *m_mediaRecorder;
@@ -74,6 +76,14 @@
     static const int RECORDER_INITIALIZATION_ERROR = -3;
 
     static const int DURATION_UPDATE_INTERVALL = 1000; // update every second
+
+    static const QLatin1String PARAM_AUDIO_BITRATE;
+    static const QLatin1String PARAM_AUDIO_CHANNELS;
+    static const QLatin1String PARAM_AUTIO_SAMPLING;
+    static const QLatin1String PARAM_LATITUDE;
+    static const QLatin1String PARAM_LONGITUDE;
+    static const QLatin1String PARAM_ORIENTATION;
+    static const QLatin1String PARAM_VIDEO_BITRATE;
 };
 
 #endif

=== modified file 'src/aalmetadatawritercontrol.cpp'
--- src/aalmetadatawritercontrol.cpp	2013-02-19 20:01:00 +0000
+++ src/aalmetadatawritercontrol.cpp	2013-06-18 12:20:22 +0000
@@ -97,3 +97,26 @@
 {
     return m_orientation;
 }
+
+/*!
+ * \brief AalMetaDataWriterControl::correctedOrientation retusn the orientation
+ * depending on which camera is active, the value is adapted
+ * \return
+ */
+int AalMetaDataWriterControl::correctedOrientation() const
+{
+    int rotation = m_orientation % 360;
+    // the front camera rotates the other way round
+    if (!m_service->isBackCameraUsed())
+        rotation = (360 - rotation) % 360;
+    return rotation;
+}
+
+/*!
+ * \brief AalMetaDataWriterControl::clearMetaData removes all metadata
+ */
+void AalMetaDataWriterControl::clearAllMetaData()
+{
+    m_orientation = 0;
+    m_metaData.clear();
+}

=== modified file 'src/aalmetadatawritercontrol.h'
--- src/aalmetadatawritercontrol.h	2013-02-19 16:48:40 +0000
+++ src/aalmetadatawritercontrol.h	2013-06-18 12:20:22 +0000
@@ -43,6 +43,9 @@
     void setMetaData(const QString & key, const QVariant & value);
 
     int orientation() const;
+    int correctedOrientation() const;
+
+    void clearAllMetaData();
 
 private:
     AalCameraService *m_service;

=== modified file 'unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro'
--- unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro	2013-06-03 09:38:16 +0000
+++ unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro	2013-06-18 12:20:22 +0000
@@ -21,6 +21,6 @@
     ../../src/aalimagecapturecontrol.cpp \
     aalcameraservice.cpp \
     aalimageencodercontrol.cpp \
-    aalmetadatawritercontrol.cpp \
+    ../stubs/aalmetadatawritercontrol_stub.cpp \
     aalvideorenderercontrol.cpp \
     storagemanager.cpp

=== modified file 'unittests/aalmediarecordercontrol/aalcameraservice.cpp'
--- unittests/aalmediarecordercontrol/aalcameraservice.cpp	2013-06-07 09:34:25 +0000
+++ unittests/aalmediarecordercontrol/aalcameraservice.cpp	2013-06-18 12:20:22 +0000
@@ -23,6 +23,7 @@
 
 AalCameraService::AalCameraService(QObject *parent) :
     QMediaService(parent),
+    m_metadataWriter(0),
     m_androidControl(0),
     m_androidListener(0)
 {

=== modified file 'unittests/aalmediarecordercontrol/aalmediarecordercontrol.pro'
--- unittests/aalmediarecordercontrol/aalmediarecordercontrol.pro	2013-05-24 11:25:15 +0000
+++ unittests/aalmediarecordercontrol/aalmediarecordercontrol.pro	2013-06-18 12:20:22 +0000
@@ -12,9 +12,11 @@
 
 HEADERS += ../../src/aalmediarecordercontrol.h \
     ../../src/aalcameraservice.h \
+    ../../src/aalmetadatawritercontrol.h \
     ../../src/storagemanager.h
 
 SOURCES += tst_aalmediarecordercontrol.cpp \
     ../../src/aalmediarecordercontrol.cpp \
     aalcameraservice.cpp \
+    ../stubs/aalmetadatawritercontrol_stub.cpp \
     storagemanager.cpp

=== added directory 'unittests/stubs'
=== renamed file 'unittests/aalimagecapturecontrol/aalmetadatawritercontrol.cpp' => 'unittests/stubs/aalmetadatawritercontrol_stub.cpp'
--- unittests/aalimagecapturecontrol/aalmetadatawritercontrol.cpp	2013-02-19 16:48:40 +0000
+++ unittests/stubs/aalmetadatawritercontrol_stub.cpp	2013-06-18 12:20:22 +0000
@@ -54,3 +54,12 @@
 {
     return m_orientation;
 }
+
+int AalMetaDataWriterControl::correctedOrientation() const
+{
+    return m_orientation;
+}
+
+void AalMetaDataWriterControl::clearAllMetaData()
+{
+}