Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
aeff2712
Commit
aeff2712
authored
Dec 30, 2014
by
François Cartegnie
🤞
Browse files
demux: dash: remove now unused blockbuffer code
parent
4e6acd5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
modules/demux/Makefile.am
View file @
aeff2712
...
...
@@ -251,9 +251,6 @@ libdash_plugin_la_SOURCES = \
demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
\
demux/dash/adaptationlogic/Representationselectors.hpp
\
demux/dash/adaptationlogic/Representationselectors.cpp
\
demux/dash/buffer/BlockBuffer.cpp
\
demux/dash/buffer/BlockBuffer.h
\
demux/dash/buffer/IBufferObserver.h
\
demux/dash/http/Chunk.cpp
\
demux/dash/http/Chunk.h
\
demux/dash/http/HTTPConnection.cpp
\
...
...
modules/demux/dash/buffer/BlockBuffer.cpp
deleted
100644 → 0
View file @
4e6acd5b
/*
* BlockBuffer.cpp
*****************************************************************************
* Copyright (C) 2010 - 2011 Klagenfurt University
*
* Created on: Aug 10, 2010
* Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>
* Christian Timmerer <christian.timmerer@itec.uni-klu.ac.at>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include
"buffer/BlockBuffer.h"
using
namespace
dash
::
buffer
;
BlockBuffer
::
BlockBuffer
()
:
sizeBytes
(
0
),
isEOF
(
false
)
{
fifo
=
block_FifoNew
();
if
(
!
fifo
)
throw
VLC_ENOMEM
;
}
BlockBuffer
::~
BlockBuffer
()
{
block_FifoRelease
(
fifo
);
}
int
BlockBuffer
::
peek
(
const
uint8_t
**
pp_peek
,
unsigned
int
len
)
{
block_t
*
p_block
=
block_FifoShow
(
fifo
);
if
(
!
p_block
)
return
0
;
*
pp_peek
=
p_block
->
p_buffer
;
return
__MIN
(
len
,
p_block
->
i_buffer
);
}
block_t
*
BlockBuffer
::
get
()
{
block_t
*
p_block
=
block_FifoGet
(
fifo
);
if
(
p_block
)
notify
();
return
p_block
;
}
void
BlockBuffer
::
put
(
block_t
*
block
)
{
block_FifoPut
(
fifo
,
block
);
notify
();
}
void
BlockBuffer
::
setEOF
(
bool
value
)
{
isEOF
=
value
;
block_FifoWake
(
fifo
);
}
bool
BlockBuffer
::
getEOF
()
{
return
isEOF
;
}
void
BlockBuffer
::
attach
(
IBufferObserver
*
observer
)
{
this
->
bufferObservers
.
push_back
(
observer
);
}
void
BlockBuffer
::
notify
()
{
// for(size_t i = 0; i < this->bufferObservers.size(); i++)
// this->bufferObservers.at(i)->bufferLevelChanged(this->sizeMicroSec, ((float)this->sizeMicroSec / this->capacityMicroSec) * 100);
}
modules/demux/dash/buffer/BlockBuffer.h
deleted
100644 → 0
View file @
4e6acd5b
/*
* BlockBuffer.h
*****************************************************************************
* Copyright (C) 2010 - 2011 Klagenfurt University
*
* Created on: Aug 10, 2010
* Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>
* Christian Timmerer <christian.timmerer@itec.uni-klu.ac.at>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef BLOCKBUFFER_H_
#define BLOCKBUFFER_H_
#include
"buffer/IBufferObserver.h"
#include
<vlc_stream.h>
#include
<vector>
#define DEFAULTBUFFERLENGTH 30000000
#define INTIALPEEKSIZE 32768
namespace
dash
{
namespace
buffer
{
class
BlockBuffer
{
public:
BlockBuffer
();
virtual
~
BlockBuffer
();
void
put
(
block_t
*
block
);
block_t
*
get
();
int
peek
(
const
uint8_t
**
pp_peek
,
unsigned
int
i_peek
);
void
setEOF
(
bool
value
);
bool
getEOF
();
void
attach
(
IBufferObserver
*
observer
);
void
notify
();
private:
size_t
sizeBytes
;
bool
isEOF
;
block_fifo_t
*
fifo
;
std
::
vector
<
IBufferObserver
*>
bufferObservers
;
};
}
}
#endif
/* BLOCKBUFFER_H_ */
modules/demux/dash/buffer/IBufferObserver.h
deleted
100644 → 0
View file @
4e6acd5b
/*
* IBufferObserver.h
*****************************************************************************
* Copyright (C) 2010 - 2011 Klagenfurt University
*
* Created on: Aug 10, 2010
* Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>
* Christian Timmerer <christian.timmerer@itec.uni-klu.ac.at>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef IBUFFEROBSERVER_H_
#define IBUFFEROBSERVER_H_
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include
<vlc_common.h>
namespace
dash
{
namespace
buffer
{
class
IBufferObserver
{
public:
virtual
~
IBufferObserver
(){}
virtual
void
bufferLevelChanged
(
mtime_t
bufferedMicroSec
,
int
bufferedPercent
)
=
0
;
};
}
}
#endif
/* IBUFFEROBSERVER_H_ */
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment