Skip to content

Update LibAV ffmpeg depencencies #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndreHro wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Update LibAV ffmpeg depencencies #22

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
67d1823
Update LibAV ffmpeg depencencies
AndreHro Sep 25, 2020
3222271
Merge pull request #1 from AndreHro/libav-update
AndreHro Sep 25, 2020
98265a2
Merge branch 'master' of https://github.com/openhome/ohPlayer into op…
AndreHro Mar 7, 2022
cdb2fb3
Merge pull request #3 from AndreHro/openhome-master
AndreHro Mar 7, 2022
6106a49
Update of dependencies and compiling under ubuntu 22.04 using clang
AndreHro Oct 9, 2022
67915d9
Update Libav.cpp
AndreHro Oct 9, 2022
455cb46
Merge pull request #5 from AndreHro/correct-LibAV
AndreHro Oct 9, 2022
9e2c32d
update interface
AndreHro Sep 1, 2024
f2a5b1e
Merge pull request #6 from AndreHro/Update-depencencies
AndreHro Sep 1, 2024
9210ee0
Merge branch 'master' into ubuntu-22-armhf
AndreHro Sep 1, 2024
75b8093
Merge pull request #4 from AndreHro/ubuntu-22-armhf
AndreHro Sep 1, 2024
b9d6f96
Update README
AndreHro Sep 1, 2024
91d4726
Disable optional features
AndreHro Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion linux/Libav.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,8 @@ TBool CodecLibAV::Recognise(const EncodedStreamInfo& aStreamInfo)
DBUG_F("[CodecLibAV] Recognise\n");
#endif

if (aStreamInfo.StreamFormat()==EncodedStreamInfo::Format::Pcm)
/*
if (aStreamInfo.Format() == EncodedStreamInfo::Format::Pcm)
{
return false;
}
Expand Down Expand Up @@ -776,7 +777,13 @@ void CodecLibAV::StreamInitialise()
iTrackLengthJiffies,
0,
false,
<<<<<<< HEAD
Copy link
Contributor

@DoomHammer DoomHammer Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're leaving conflict markers in here

Copy link
Author

@AndreHro AndreHro Oct 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @DoomHammer,
thanks for the hind. I corrected this.
Br André

DeriveProfile(iAvCodecContext->channels));
=======
*iSpeakerProfile);


>>>>>>> 0f88520d108c8e78e77f6fd9deef52514eca228e

// Create a frame to hold the decoded packets.
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101)
Expand Down Expand Up @@ -953,8 +960,12 @@ TBool CodecLibAV::TrySeek(TUint aStreamId, TUint64 aSample)
iTrackLengthJiffies,
aSample,
false,
<<<<<<< HEAD
DeriveProfile(iAvCodecContext->channels)
);
=======
*iSpeakerProfile);
>>>>>>> 0f88520d108c8e78e77f6fd9deef52514eca228e

// Ditch any PCM we have buffered.
iOutput.SetBytes(0);
Expand Down