Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e92306a0 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 72ff5903: 720p24 i-frames every 2 secs. 

* commit '72ff5903':
  720p24 i-frames every 2 secs.
parents 547b467b 72ff5903

media/libstagefright/wifi-display/source/Converter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ status_t Converter::initEncoder() { 
        mOutputFormat->setInt32("bitrate", audioBitrate);

    } else {

        mOutputFormat->setInt32("bitrate", videoBitrate);

        mOutputFormat->setInt32("frame-rate", 30);

        mOutputFormat->setInt32("i-frame-interval", 3);  // Iframes every 3 secs

        mOutputFormat->setInt32("frame-rate", 24);

        mOutputFormat->setInt32("i-frame-interval", 2);  // Iframes every 2 secs

    }



    ALOGV("output format is '%s'", mOutputFormat->debugString(0).c_str());

media/libstagefright/wifi-display/source/PlaybackSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ status_t WifiDisplaySource::PlaybackSession::addVideoSource() { 
    sp<SurfaceMediaSource> source = new SurfaceMediaSource(width(), height());



    sp<MediaSource> videoSource =

            new RepeaterSource(source, 30.0 /* rateHz */);

            new RepeaterSource(source, 24.0 /* rateHz */);



    size_t numInputBuffers;

    status_t err = addSource(true /* isVideo */, videoSource, &numInputBuffers);

media/libstagefright/wifi-display/source/WifiDisplaySource.cpp

+3 −1
Original line number Diff line number Diff line
@@ -471,9 +471,11 @@ status_t WifiDisplaySource::sendM4(int32_t sessionID) { 
    //   use "30 00 02 02 00000040 00000000 00000000 00 0000 0000 00 none none\r\n"

    // For 720p30:

    //   use "28 00 02 02 00000020 00000000 00000000 00 0000 0000 00 none none\r\n"

    // For 720p24:

    //   use "78 00 02 02 00008000 00000000 00000000 00 0000 0000 00 none none\r\n"

    AString body = StringPrintf(

        "wfd_video_formats: "

        "28 00 02 02 00000020 00000000 00000000 00 0000 0000 00 none none\r\n"

        "78 00 02 02 00008000 00000000 00000000 00 0000 0000 00 none none\r\n"

        "wfd_audio_codecs: AAC 00000001 00\r\n"  // 2 ch AAC 48kHz

        "wfd_presentation_URL: rtsp://%s:%d/wfd1.0/streamid=0 none\r\n"

        "wfd_client_rtp_ports: RTP/AVP/%s;unicast 19000 0 mode=play\r\n",