void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix code style

Browse source
This commit is contained in:
Alexander Kernozhitsky 2022-09-03 18:07:11 +03:00 • committed by John Preston
parent c6c2a44e9d
commit a5bd4ef6f7
8 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
View file

@ -47,11 +47,11 @@ private:
return (_rotation == 90) || (_rotation == 270); return (_rotation == 90) || (_rotation == 270);
} }
[[nodiscard]] static int _read( [[nodiscard]] static int Read(
void *opaque, void *opaque,
uint8_t *buf, uint8_t *buf,
int buf_size); int buf_size);
[[nodiscard]] static int64_t _seek( [[nodiscard]] static int64_t Seek(
void *opaque, void *opaque,
int64_t offset, int64_t offset,
int whence); int whence);

8
Telegram/SourceFiles/media/audio/media_audio_capture.cpp
View file

@ -176,7 +176,7 @@ struct Instance::Inner::Private {
uint16 waveformPeak = 0; uint16 waveformPeak = 0;
QVector<uchar> waveform; QVector<uchar> waveform;
static int _read_data(void *opaque, uint8_t *buf, int buf_size) { static int ReadData(void *opaque, uint8_t *buf, int buf_size) {
auto l = reinterpret_cast<Private*>(opaque); auto l = reinterpret_cast<Private*>(opaque);
int32 nbytes = qMin(l->data.size() - l->dataPos, int32(buf_size)); int32 nbytes = qMin(l->data.size() - l->dataPos, int32(buf_size));
@ -189,7 +189,7 @@ struct Instance::Inner::Private {
return nbytes; return nbytes;
} }
static int _write_data(void *opaque, uint8_t *buf, int buf_size) { static int WriteData(void *opaque, uint8_t *buf, int buf_size) {
auto l = reinterpret_cast<Private*>(opaque); auto l = reinterpret_cast<Private*>(opaque);
if (buf_size <= 0) return 0; if (buf_size <= 0) return 0;
@ -199,7 +199,7 @@ struct Instance::Inner::Private {
return buf_size; return buf_size;
} }
static int64_t _seek_data(void *opaque, int64_t offset, int whence) { static int64_t SeekData(void *opaque, int64_t offset, int whence) {
auto l = reinterpret_cast<Private*>(opaque); auto l = reinterpret_cast<Private*>(opaque);
int32 newPos = -1; int32 newPos = -1;
@ -260,7 +260,7 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
d->ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize); d->ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
d->ioContext = avio_alloc_context(d->ioBuffer, FFmpeg::kAVBlockSize, 1, static_cast<void*>(d.get()), &Private::_read_data, &Private::_write_data, &Private::_seek_data); d->ioContext = avio_alloc_context(d->ioBuffer, FFmpeg::kAVBlockSize, 1, static_cast<void*>(d.get()), &Private::ReadData, &Private::WriteData, &Private::SeekData);
int res = 0; int res = 0;
char err[AV_ERROR_MAX_STRING_SIZE] = { 0 }; char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
const AVOutputFormat *fmt = nullptr; const AVOutputFormat *fmt = nullptr;

18
Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
View file

@ -38,11 +38,11 @@ bool AbstractFFMpegLoader::open(crl::time positionMs) {
ioBuffer = (uchar *)av_malloc(FFmpeg::kAVBlockSize); ioBuffer = (uchar *)av_malloc(FFmpeg::kAVBlockSize);
if (!_data.isEmpty()) { if (!_data.isEmpty()) {
ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_data, 0, &AbstractFFMpegLoader::_seek_data); ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::ReadData, 0, &AbstractFFMpegLoader::SeekData);
} else if (!_bytes.empty()) { } else if (!_bytes.empty()) {
ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_bytes, 0, &AbstractFFMpegLoader::_seek_bytes); ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::ReadBytes, 0, &AbstractFFMpegLoader::SeekBytes);
} else { } else {
ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_file, 0, &AbstractFFMpegLoader::_seek_file); ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::ReadFile, 0, &AbstractFFMpegLoader::SeekFile);
} }
fmtContext = avformat_alloc_context(); fmtContext = avformat_alloc_context();
if (!fmtContext) { if (!fmtContext) {
@ -100,7 +100,7 @@ AbstractFFMpegLoader::~AbstractFFMpegLoader() {
if (fmtContext) avformat_free_context(fmtContext); if (fmtContext) avformat_free_context(fmtContext);
} }
int AbstractFFMpegLoader::_read_data(void *opaque, uint8_t *buf, int buf_size) { int AbstractFFMpegLoader::ReadData(void *opaque, uint8_t *buf, int buf_size) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
auto nbytes = qMin(l->_data.size() - l->_dataPos, int32(buf_size)); auto nbytes = qMin(l->_data.size() - l->_dataPos, int32(buf_size));
@ -113,7 +113,7 @@ int AbstractFFMpegLoader::_read_data(void *opaque, uint8_t *buf, int buf_size) {
return nbytes; return nbytes;
} }
int64_t AbstractFFMpegLoader::_seek_data(void *opaque, int64_t offset, int whence) { int64_t AbstractFFMpegLoader::SeekData(void *opaque, int64_t offset, int whence) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
int32 newPos = -1; int32 newPos = -1;
@ -133,7 +133,7 @@ int64_t AbstractFFMpegLoader::_seek_data(void *opaque, int64_t offset, int whenc
return l->_dataPos; return l->_dataPos;
} }
int AbstractFFMpegLoader::_read_bytes(void *opaque, uint8_t *buf, int buf_size) { int AbstractFFMpegLoader::ReadBytes(void *opaque, uint8_t *buf, int buf_size) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
auto nbytes = qMin(static_cast<int>(l->_bytes.size()) - l->_dataPos, buf_size); auto nbytes = qMin(static_cast<int>(l->_bytes.size()) - l->_dataPos, buf_size);
@ -146,7 +146,7 @@ int AbstractFFMpegLoader::_read_bytes(void *opaque, uint8_t *buf, int buf_size)
return nbytes; return nbytes;
} }
int64_t AbstractFFMpegLoader::_seek_bytes(void *opaque, int64_t offset, int whence) { int64_t AbstractFFMpegLoader::SeekBytes(void *opaque, int64_t offset, int whence) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
int32 newPos = -1; int32 newPos = -1;
@ -167,7 +167,7 @@ int64_t AbstractFFMpegLoader::_seek_bytes(void *opaque, int64_t offset, int when
return l->_dataPos; return l->_dataPos;
} }
int AbstractFFMpegLoader::_read_file(void *opaque, uint8_t *buf, int buf_size) { int AbstractFFMpegLoader::ReadFile(void *opaque, uint8_t *buf, int buf_size) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
int ret = l->_f.read((char *)(buf), buf_size); int ret = l->_f.read((char *)(buf), buf_size);
switch (ret) { switch (ret) {
@ -177,7 +177,7 @@ int AbstractFFMpegLoader::_read_file(void *opaque, uint8_t *buf, int buf_size) {
} }
} }
int64_t AbstractFFMpegLoader::_seek_file(void *opaque, int64_t offset, int whence) { int64_t AbstractFFMpegLoader::SeekFile(void *opaque, int64_t offset, int whence) {
auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque); auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
switch (whence) { switch (whence) {

12
Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
View file

@ -70,12 +70,12 @@ protected:
bool _opened = false; bool _opened = false;
private: private:
static int _read_data(void *opaque, uint8_t *buf, int buf_size); static int ReadData(void *opaque, uint8_t *buf, int buf_size);
static int64_t _seek_data(void *opaque, int64_t offset, int whence); static int64_t SeekData(void *opaque, int64_t offset, int whence);
static int _read_bytes(void *opaque, uint8_t *buf, int buf_size); static int ReadBytes(void *opaque, uint8_t *buf, int buf_size);
static int64_t _seek_bytes(void *opaque, int64_t offset, int whence); static int64_t SeekBytes(void *opaque, int64_t offset, int whence);
static int _read_file(void *opaque, uint8_t *buf, int buf_size); static int ReadFile(void *opaque, uint8_t *buf, int buf_size);
static int64_t _seek_file(void *opaque, int64_t offset, int whence); static int64_t SeekFile(void *opaque, int64_t offset, int whence);
}; };

6
Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
View file

@ -283,7 +283,7 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
return false; return false;
} }
_ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize); _ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
_ioContext = avio_alloc_context(_ioBuffer, FFmpeg::kAVBlockSize, 0, static_cast<void*>(this), &FFMpegReaderImplementation::_read, nullptr, &FFMpegReaderImplementation::_seek); _ioContext = avio_alloc_context(_ioBuffer, FFmpeg::kAVBlockSize, 0, static_cast<void*>(this), &FFMpegReaderImplementation::Read, nullptr, &FFMpegReaderImplementation::Seek);
_fmtContext = avformat_alloc_context(); _fmtContext = avformat_alloc_context();
if (!_fmtContext) { if (!_fmtContext) {
LOG(("Gif Error: Unable to avformat_alloc_context %1").arg(logData())); LOG(("Gif Error: Unable to avformat_alloc_context %1").arg(logData()));
@ -480,7 +480,7 @@ FFMpegReaderImplementation::PacketResult FFMpegReaderImplementation::readAndProc
return result; return result;
} }
int FFMpegReaderImplementation::_read(void *opaque, uint8_t *buf, int buf_size) { int FFMpegReaderImplementation::Read(void *opaque, uint8_t *buf, int buf_size) {
FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque); FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque);
int ret = l->_device->read((char*)(buf), buf_size); int ret = l->_device->read((char*)(buf), buf_size);
switch (ret) { switch (ret) {
@ -490,7 +490,7 @@ int FFMpegReaderImplementation::_read(void *opaque, uint8_t *buf, int buf_size)
} }
} }
int64_t FFMpegReaderImplementation::_seek(void *opaque, int64_t offset, int whence) { int64_t FFMpegReaderImplementation::Seek(void *opaque, int64_t offset, int whence) {
FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque); FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque);
switch (whence) { switch (whence) {

4
Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h
View file

@ -76,8 +76,8 @@ private:
return (_rotation == Rotation::Degrees90) || (_rotation == Rotation::Degrees270); return (_rotation == Rotation::Degrees90) || (_rotation == Rotation::Degrees270);
} }
static int _read(void *opaque, uint8_t *buf, int buf_size); static int Read(void *opaque, uint8_t *buf, int buf_size);
static int64_t _seek(void *opaque, int64_t offset, int whence); static int64_t Seek(void *opaque, int64_t offset, int whence);
Mode _mode = Mode::Silent; Mode _mode = Mode::Silent;

8
Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
View file

@ -44,12 +44,12 @@ File::Context::Context(
File::Context::~Context() = default; File::Context::~Context() = default;
int File::Context::_read(void *opaque, uint8_t *buffer, int bufferSize) { int File::Context::Read(void *opaque, uint8_t *buffer, int bufferSize) {
return static_cast<Context*>(opaque)->read( return static_cast<Context*>(opaque)->read(
bytes::make_span(buffer, bufferSize)); bytes::make_span(buffer, bufferSize));
} }
int64_t File::Context::_seek(void *opaque, int64_t offset, int whence) { int64_t File::Context::Seek(void *opaque, int64_t offset, int whence) {
return static_cast<Context*>(opaque)->seek(offset, whence); return static_cast<Context*>(opaque)->seek(offset, whence);
} }
@ -276,9 +276,9 @@ void File::Context::start(crl::time position, bool hwAllow) {
} }
auto format = FFmpeg::MakeFormatPointer( auto format = FFmpeg::MakeFormatPointer(
static_cast<void *>(this), static_cast<void *>(this),
&Context::_read, &Context::Read,
nullptr, nullptr,
&Context::_seek); &Context::Seek);
if (!format) { if (!format) {
return fail(Error::OpenFailed); return fail(Error::OpenFailed);
} }

4
Telegram/SourceFiles/media/streaming/media_streaming_file.h
View file

@ -62,8 +62,8 @@ private:
Allowed, Allowed,
Disallowed, Disallowed,
}; };
static int _read(void *opaque, uint8_t *buffer, int bufferSize); static int Read(void *opaque, uint8_t *buffer, int bufferSize);
static int64_t _seek(void *opaque, int64_t offset, int whence); static int64_t Seek(void *opaque, int64_t offset, int whence);
[[nodiscard]] int read(bytes::span buffer); [[nodiscard]] int read(bytes::span buffer);
[[nodiscard]] int64_t seek(int64_t offset, int whence); [[nodiscard]] int64_t seek(int64_t offset, int whence);